Skip to content

Commit a1ae2a3

Browse files
umjammerumjammer
committed
out source swing related
1 parent c64c87d commit a1ae2a3

File tree

6 files changed

+23
-403
lines changed

6 files changed

+23
-403
lines changed

‎build.xml

+11-66
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<!-- -->
88
<!-- vavi-commons-sandbox -->
99
<!-- -->
10-
<!-- @author Naohide Sano -->
11-
<!-- @version 0.00 021018 nsano initial version -->
10+
<!-- @author Naohide Sano -->
11+
<!-- @version 0.00 021018 nsano initial version -->
1212
<!-- -->
1313
<!-- ////////////////////////////////////////////////////////////////////// -->
1414

15-
<project name="vavi-commons-sandbox" default="compile" basedir="."
15+
<project name="vavi-commons-sandbox" default="run" basedir="."
1616
xmlns:artifact="urn:maven-artifact-ant">
1717

1818
<path id="maven-ant-tasks.classpath">
@@ -31,84 +31,29 @@
3131

3232
<!-- Path Definitions -->
3333
<path id="project.class.path">
34+
<pathelement location="${javac.dest.test}" />
35+
<pathelement location="${javac.dest}" />
3436
<fileset refid="maven-ant-tasks.dependency.fileset" />
3537
</path>
3638

37-
<!-- clean -->
38-
<target name="clean" description="Cleaning">
39-
<delete>
40-
<fileset dir="${javac.dest}">
41-
<include name="**/*" />
42-
</fileset>
43-
<fileset dir="${javac.dest.test}">
44-
<include name="**/*" />
45-
</fileset>
46-
</delete>
47-
</target>
48-
4939
<!-- prepare -->
5040
<target name="prepare" description="Preparing">
5141
<artifact:pom file="pom.xml" id="maven.project" />
5242
<artifact:dependencies fileSetId="maven-ant-tasks.dependency.fileset">
5343
<pom refid="maven.project" />
5444
</artifact:dependencies>
55-
</target>
56-
57-
<!-- javac -->
58-
<target name="compile" depends="prepare" description="Compiling">
59-
<javac debug="on"
60-
destdir="${javac.dest}"
61-
source="${project.build.plugins.plugin.configuration.source}"
62-
target="${project.build.plugins.plugin.configuration.target}"
63-
encoding="${project.build.plugins.plugin.configuration.encoding}">
64-
<classpath refid="project.class.path" />
65-
<include name="**/*.java" />
66-
<src path="${javac.source}" />
67-
</javac>
68-
69-
<copy todir="${javac.dest}">
70-
<fileset dir="${javac.resource}">
71-
<include name="**/*" />
72-
</fileset>
73-
</copy>
74-
75-
<javac debug="on"
76-
destdir="${javac.dest.test}"
77-
source="${project.build.plugins.plugin.configuration.source}"
78-
target="${project.build.plugins.plugin.configuration.target}"
79-
encoding="${project.build.plugins.plugin.configuration.encoding}">
80-
<classpath>
81-
<path refid="project.class.path" />
82-
<pathelement location="${javac.dest}" />
83-
</classpath>
84-
<include name="**/*.java" />
85-
<src path="${javac.source.test}" />
86-
</javac>
87-
88-
<copy todir="${javac.dest.test}">
89-
<fileset dir="${javac.resource.test}">
90-
<include name="**/*" />
91-
</fileset>
92-
</copy>
93-
</target>
94-
95-
<!-- jar -->
96-
<target name="package" depends="compile" description="パッケージング">
97-
<jar jarfile="target/${project.artifactId}-${project.version}.jar">
98-
<fileset dir="${dir.build}">
99-
<include name="**/*" />
100-
</fileset>
101-
</jar>
45+
<artifact:mvn pom="pom.xml">
46+
<arg value="package"/>
47+
<arg value="-Dmaven.test.skip=true"/>
48+
</artifact:mvn>
10249
</target>
10350

10451
<!-- run -->
105-
<target name="run" depends="compile" description="Run">
52+
<target name="run" depends="prepare" description="Run">
10653
<java classname="vavi.util.JapaneseCalendarTest" fork="yes">
107-
<jvmarg value="-Dfile.encoding=UTF-8" />
54+
<jvmarg value="-Dfile.encoding=${project.build.plugins.plugin.configuration.encoding}" />
10855
<classpath>
10956
<path refid="project.class.path" />
110-
<pathelement location="${dir.build}" />
111-
<pathelement location="target/test-classes" />
11257
</classpath>
11358
<arg line="${args}" />
11459
</java>

‎pom.xml

+12-58
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,13 @@
1111
<organization>
1212
<name></name>
1313
</organization>
14-
<version>0.3.2</version>
14+
<version>0.3.3</version>
1515
<url>https://github.com/umjammer/vavi-commons</url>
16-
<description>0.3.2
16+
<description>0.3.3
17+
18+
out source swing related
19+
20+
0.3.2
1721

1822
move LevenshteinDistance to vavi-commons
1923
add swing xml pretty printer</description>
@@ -26,37 +30,6 @@
2630
</distributionManagement>
2731
<build>
2832
<plugins>
29-
<plugin>
30-
<artifactId>maven-deploy-plugin</artifactId>
31-
<version>2.8.1</version>
32-
<configuration>
33-
<altDeploymentRepository>internal.repo::default::file://${project.build.directory}/mvn-repo</altDeploymentRepository>
34-
</configuration>
35-
</plugin>
36-
<plugin>
37-
<groupId>com.github.github</groupId>
38-
<artifactId>site-maven-plugin</artifactId>
39-
<version>0.11</version>
40-
<configuration>
41-
<message>Maven artifacts for ${project.version}</message> <!-- git commit message -->
42-
<noJekyll>true</noJekyll> <!-- disable webpage processing -->
43-
<outputDirectory>${project.build.directory}/mvn-repo</outputDirectory> <!-- matches distribution management repository url above -->
44-
<branch>refs/heads/mvn-repo</branch> <!-- remote branch name -->
45-
<includes><include>**/*</include></includes>
46-
<repositoryName>vavi-commons</repositoryName> <!-- github repo name -->
47-
<repositoryOwner>umjammer</repositoryOwner> <!-- github username -->
48-
<merge>true</merge>
49-
</configuration>
50-
<executions>
51-
<!-- run site-maven-plugin's 'site' target as part of the build's normal 'deploy' phase -->
52-
<execution>
53-
<goals>
54-
<goal>site</goal>
55-
</goals>
56-
<phase>deploy</phase>
57-
</execution>
58-
</executions>
59-
</plugin>
6033
<plugin>
6134
<artifactId>maven-compiler-plugin</artifactId>
6235
<configuration>
@@ -65,7 +38,6 @@
6538
<encoding>utf-8</encoding>
6639
<generatedSourcesDirectory>target/generated-sources/jjtree</generatedSourcesDirectory>
6740
</configuration>
68-
<version>3.3</version>
6941
</plugin>
7042
<plugin>
7143
<groupId>org.codehaus.mojo</groupId>
@@ -168,20 +140,8 @@
168140
</build>
169141
<repositories>
170142
<repository>
171-
<id>vavi-commons-mvn-repo</id>
172-
<url>https://raw.githubusercontent.com/umjammer/vavi-commons/mvn-repo/</url>
173-
<snapshots>
174-
<enabled>true</enabled>
175-
<updatePolicy>always</updatePolicy>
176-
</snapshots>
177-
</repository>
178-
<repository>
179-
<id>vavi-awt-mvn-repo</id>
180-
<url>https://raw.githubusercontent.com/umjammer/vavi-awt/mvn-repo/</url>
181-
<snapshots>
182-
<enabled>true</enabled>
183-
<updatePolicy>always</updatePolicy>
184-
</snapshots>
143+
<id>jitpack.io</id>
144+
<url>https://jitpack.io</url>
185145
</repository>
186146
</repositories>
187147
<dependencies>
@@ -211,15 +171,9 @@
211171
<optional>false</optional>
212172
</dependency>
213173
<dependency>
214-
<groupId>vavi</groupId>
174+
<groupId>com.github.umjammer</groupId>
215175
<artifactId>vavi-commons</artifactId>
216-
<version>1.0.4</version>
217-
</dependency>
218-
<dependency>
219-
<groupId>vavi</groupId>
220-
<artifactId>vavi-awt</artifactId>
221-
<version>1.0.0</version>
222-
<optional>false</optional>
176+
<version>1.0.6</version>
223177
</dependency>
224178
<dependency>
225179
<groupId>net.sf.jacob-project</groupId>
@@ -233,9 +187,9 @@
233187
<github.global.server>github</github.global.server>
234188
</properties>
235189
<scm>
236-
<url>https://github.com/umjammer/vavi-commons/tree/master/vavi-commons-sandbox</url>
190+
<url>https://github.com/umjammer/vavi-commons-sandbox/tree/master/vavi-commons-sandbox</url>
237191
</scm>
238192
<issueManagement>
239-
<url>https://github.com/umjammer/vavi-commons/issues</url>
193+
<url>https://github.com/umjammer/vavi-commons-sandbox/issues</url>
240194
</issueManagement>
241195
</project>

‎src/main/java/vavix/swing/editormanager/DefaultEditorManager.java

-56
This file was deleted.

‎src/main/java/vavix/swing/editormanager/Editor.java

-47
This file was deleted.

0 commit comments

Comments
 (0)