[286404] Ant Task for Profile Definition
https://bugs.eclipse.org/bugs/show_bug.cgi?id=286404
Code review comments: remove "UML" from several class names and some text presented to users.
diff --git a/plugins/org.eclipse.uml2.ant/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.ant/META-INF/MANIFEST.MF
index 4a2d894..51aae90 100644
--- a/plugins/org.eclipse.uml2.ant/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.ant/META-INF/MANIFEST.MF
@@ -17,4 +17,4 @@
org.eclipse.uml2.ant.taskdefs,
org.eclipse.uml2.ant.util
Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.eclipse.uml2.ant.UMLAntPlugin
+Bundle-Activator: org.eclipse.uml2.ant.AntPlugin
diff --git a/plugins/org.eclipse.uml2.ant/plugin.xml b/plugins/org.eclipse.uml2.ant/plugin.xml
index 08a4ebf..edf6549 100644
--- a/plugins/org.eclipse.uml2.ant/plugin.xml
+++ b/plugins/org.eclipse.uml2.ant/plugin.xml
@@ -20,7 +20,7 @@
</extension>
<extension point="org.eclipse.ant.core.antTasks">
- <antTask library="ant_tasks/uml2.ant.tasks.jar" name="uml2.defineProfile" headless="true" class="org.eclipse.uml2.ant.taskdefs.UMLDefineProfileTask"/>
+ <antTask library="ant_tasks/uml2.ant.tasks.jar" name="uml2.defineProfile" headless="true" class="org.eclipse.uml2.ant.taskdefs.DefineProfileTask"/>
</extension>
<extension id="defineProfile" point="org.eclipse.core.runtime.applications">
diff --git a/plugins/org.eclipse.uml2.ant/src/org/eclipse/uml2/ant/UMLAntPlugin.java b/plugins/org.eclipse.uml2.ant/src/org/eclipse/uml2/ant/AntPlugin.java
similarity index 82%
rename from plugins/org.eclipse.uml2.ant/src/org/eclipse/uml2/ant/UMLAntPlugin.java
rename to plugins/org.eclipse.uml2.ant/src/org/eclipse/uml2/ant/AntPlugin.java
index 5d21283..6c2d074 100644
--- a/plugins/org.eclipse.uml2.ant/src/org/eclipse/uml2/ant/UMLAntPlugin.java
+++ b/plugins/org.eclipse.uml2.ant/src/org/eclipse/uml2/ant/AntPlugin.java
@@ -18,21 +18,21 @@
/**
- * The plug-in activator/lifecycle class for the UML Ant plug-in..
+ * The plug-in activator/lifecycle class for the UML2 Ant plug-in.
*/
-public class UMLAntPlugin
+public class AntPlugin
extends Plugin {
- private static UMLAntPlugin instance;
+ private static AntPlugin instance;
- public UMLAntPlugin() {
+ public AntPlugin() {
super();
}
/**
* Obtains the shared instance of the plug-in activator.
*/
- public static UMLAntPlugin getInstance() {
+ public static AntPlugin getInstance() {
return instance;
}
diff --git a/plugins/org.eclipse.uml2.ant/tasks/org/eclipse/uml2/ant/taskdefs/UMLDefineProfileTask.java b/plugins/org.eclipse.uml2.ant/tasks/org/eclipse/uml2/ant/taskdefs/DefineProfileTask.java
similarity index 99%
rename from plugins/org.eclipse.uml2.ant/tasks/org/eclipse/uml2/ant/taskdefs/UMLDefineProfileTask.java
rename to plugins/org.eclipse.uml2.ant/tasks/org/eclipse/uml2/ant/taskdefs/DefineProfileTask.java
index 1c71958..a51f14a 100644
--- a/plugins/org.eclipse.uml2.ant/tasks/org/eclipse/uml2/ant/taskdefs/UMLDefineProfileTask.java
+++ b/plugins/org.eclipse.uml2.ant/tasks/org/eclipse/uml2/ant/taskdefs/DefineProfileTask.java
@@ -74,7 +74,7 @@
* </pre>
*
*/
-public class UMLDefineProfileTask
+public class DefineProfileTask
extends EMFTask {
private Commandline commandline = new Commandline();
diff --git a/tests/org.eclipse.uml2.ant.tests/UML Ant Tests.launch b/tests/org.eclipse.uml2.ant.tests/UML2 Ant Tests.launch
old mode 100755
new mode 100644
similarity index 97%
rename from tests/org.eclipse.uml2.ant.tests/UML Ant Tests.launch
rename to tests/org.eclipse.uml2.ant.tests/UML2 Ant Tests.launch
index 62eaaa2..409e74c
--- a/tests/org.eclipse.uml2.ant.tests/UML Ant Tests.launch
+++ b/tests/org.eclipse.uml2.ant.tests/UML2 Ant Tests.launch
@@ -14,7 +14,7 @@
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.uml2.ant.tests/src/org/eclipse/uml2/ant/tests/UMLAntAllTests.java"/>
+<listEntry value="/org.eclipse.uml2.ant.tests/src/org/eclipse/uml2/ant/tests/AntAllTests.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@@ -30,7 +30,7 @@
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.uml2.ant.tests.UMLAntAllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.uml2.ant.tests.AntAllTests"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-consolelog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.uml2.ant.tests"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
diff --git a/tests/org.eclipse.uml2.ant.tests/src/org/eclipse/uml2/ant/tests/UMLAntAllTests.java b/tests/org.eclipse.uml2.ant.tests/src/org/eclipse/uml2/ant/tests/AntAllTests.java
similarity index 76%
rename from tests/org.eclipse.uml2.ant.tests/src/org/eclipse/uml2/ant/tests/UMLAntAllTests.java
rename to tests/org.eclipse.uml2.ant.tests/src/org/eclipse/uml2/ant/tests/AntAllTests.java
index 09382da..1bf8af4 100644
--- a/tests/org.eclipse.uml2.ant.tests/src/org/eclipse/uml2/ant/tests/UMLAntAllTests.java
+++ b/tests/org.eclipse.uml2.ant.tests/src/org/eclipse/uml2/ant/tests/AntAllTests.java
@@ -18,22 +18,22 @@
import junit.framework.TestSuite;
/**
- * The master test suite for the UML Ant Tasks tests.
+ * The master test suite for the UML2 Ant Tasks tests.
*/
-public class UMLAntAllTests
+public class AntAllTests
extends TestSuite {
/**
* Initializes me with my name.
*/
- public UMLAntAllTests(String name) {
+ public AntAllTests(String name) {
super(name);
}
public static Test suite() {
- TestSuite suite = new UMLAntAllTests("UML Ant Tasks Tests"); //$NON-NLS-1$
+ TestSuite suite = new AntAllTests("Ant Tasks Tests"); //$NON-NLS-1$
suite.addTestSuite(DefineProfileApplicationTest.class);
- suite.addTestSuite(UMLDefineProfileTaskTest.class);
+ suite.addTestSuite(DefineProfileTaskTest.class);
return suite;
}
diff --git a/tests/org.eclipse.uml2.ant.tests/src/org/eclipse/uml2/ant/tests/UMLDefineProfileTaskTest.java b/tests/org.eclipse.uml2.ant.tests/src/org/eclipse/uml2/ant/tests/DefineProfileTaskTest.java
similarity index 98%
rename from tests/org.eclipse.uml2.ant.tests/src/org/eclipse/uml2/ant/tests/UMLDefineProfileTaskTest.java
rename to tests/org.eclipse.uml2.ant.tests/src/org/eclipse/uml2/ant/tests/DefineProfileTaskTest.java
index 2f95f9a..aa2a9a3 100644
--- a/tests/org.eclipse.uml2.ant.tests/src/org/eclipse/uml2/ant/tests/UMLDefineProfileTaskTest.java
+++ b/tests/org.eclipse.uml2.ant.tests/src/org/eclipse/uml2/ant/tests/DefineProfileTaskTest.java
@@ -63,7 +63,7 @@
*
* @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=286404
*/
-public class UMLDefineProfileTaskTest
+public class DefineProfileTaskTest
extends TestCase {
private static final String ECORE_ANNOTATION_URI = "http://www.eclipse.org/emf/2002/Ecore";
@@ -75,16 +75,16 @@
private ResourceSet rset;
- public UMLDefineProfileTaskTest() {
+ public DefineProfileTaskTest() {
super();
}
- public UMLDefineProfileTaskTest(String name) {
+ public DefineProfileTaskTest(String name) {
super(name);
}
public static Test suite() {
- return new TestSuite(UMLDefineProfileTaskTest.class,
+ return new TestSuite(DefineProfileTaskTest.class,
"UML Profile Definition Ant Task tests"); //$NON-NLS-1$
}
diff --git a/tests/org.eclipse.uml2.ant.tests/src/org/eclipse/uml2/ant/tests/UMLDefineProfileTaskTest.profile.uml b/tests/org.eclipse.uml2.ant.tests/src/org/eclipse/uml2/ant/tests/DefineProfileTaskTest.profile.uml
similarity index 100%
rename from tests/org.eclipse.uml2.ant.tests/src/org/eclipse/uml2/ant/tests/UMLDefineProfileTaskTest.profile.uml
rename to tests/org.eclipse.uml2.ant.tests/src/org/eclipse/uml2/ant/tests/DefineProfileTaskTest.profile.uml
