[532217] Eliminate/fix warnings, ensure tests run, build the Ant jar.
Change-Id: I8f9bc69e1ce73fa582416959cdd5c7bc466a2486
Signed-off-by: Ed Merks <ed.merks@gmail.com>
diff --git a/plugins/org.eclipse.uml2.ant/.externalToolBuilders/org.eclipse.uml2.ant.build.ant_tasks.launch b/plugins/org.eclipse.uml2.ant/.externalToolBuilders/org.eclipse.uml2.ant.build.ant_tasks.launch
new file mode 100644
index 0000000..c536f0e
--- /dev/null
+++ b/plugins/org.eclipse.uml2.ant/.externalToolBuilders/org.eclipse.uml2.ant.build.ant_tasks.launch
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/>
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.uiSET_INPUTHANDLER" value="false"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.uml2.ant/ant_tasks" type="2"/> </resources>}"/>
+<booleanAttribute key="org.eclipse.debug.core.capture_output" value="false"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="false"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.uml2.ant"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.uml2.ant/build_ant_tasks.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,clean"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>
diff --git a/plugins/org.eclipse.uml2.ant/.project b/plugins/org.eclipse.uml2.ant/.project
index bb89aba..0316e2b 100644
--- a/plugins/org.eclipse.uml2.ant/.project
+++ b/plugins/org.eclipse.uml2.ant/.project
@@ -20,31 +20,19 @@
<arguments>
</arguments>
</buildCommand>
- <buildCommand>
- <name>org.eclipse.buckminster.ant.AntBuilder</name>
- <arguments>
- <dictionary>
- <key>given.name</key>
- <value>Create Ant tasks JAR</value>
- </dictionary>
- <dictionary>
- <key>script.file</key>
- <value>build_ant_tasks.xml</value>
- </dictionary>
- <dictionary>
- <key>derived.resource</key>
- <value>ant_tasks</value>
- </dictionary>
- <dictionary>
- <key>refresh.resource</key>
- <value>ant_tasks</value>
- </dictionary>
- <dictionary>
- <key>delta.resource</key>
- <value>tasks</value>
- </dictionary>
- </arguments>
- </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>LaunchConfigHandle</key>
+ <value><project>/.externalToolBuilders/org.eclipse.uml2.ant.build.ant_tasks.launch</value>
+ </dictionary>
+ <dictionary>
+ <key>incclean</key>
+ <value>true</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
diff --git a/plugins/org.eclipse.uml2.ant/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.uml2.ant/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000..c0ede4b
--- /dev/null
+++ b/plugins/org.eclipse.uml2.ant/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,3 @@
+compilers.p.build.output.library=2
+compilers.p.build.source.library=2
+eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.uml2.types/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.uml2.types/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..af0f20f
--- /dev/null
+++ b/plugins/org.eclipse.uml2.types/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.uml2.uml.ecore.importer/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.uml2.uml.ecore.importer/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000..c0ede4b
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml.ecore.importer/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,3 @@
+compilers.p.build.output.library=2
+compilers.p.build.source.library=2
+eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/presentation/UMLActionBarContributor.java b/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/presentation/UMLActionBarContributor.java
index 7ea0554..7cfe29c 100644
--- a/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/presentation/UMLActionBarContributor.java
+++ b/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/presentation/UMLActionBarContributor.java
@@ -578,7 +578,7 @@
if (submenuActions
.containsKey(submenuManager.getMenuText())) {
depopulateManager(submenuManager,
- submenuActions.get(contributionItem));
+ submenuActions.get(submenuManager.getMenuText()));
manager.remove(contributionItem);
}
}
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.uml2.uml.profile.standard/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..af0f20f
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.uml2.uml.resources/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.uml2.uml.resources/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..af0f20f
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml.resources/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PackageOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PackageOperations.java
index 708cc1f..bb28ea1 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PackageOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PackageOperations.java
@@ -148,7 +148,7 @@
Element baseElement = getBaseElement(eObject);
return baseElement == null
? super.createCopy(eObject)
- : applyStereotype(baseElement, getTarget(eObject.eClass()));
+ : applyStereotype(baseElement, getTarget(eObject.eClass()), null);
}
@Override
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StateOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StateOperations.java
index 47299fc..e7dfe67 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StateOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StateOperations.java
@@ -400,7 +400,7 @@
if (redefinedRegion instanceof Region
&& ((Region) redefinedRegion).getSubvertices()
- .contains(redefinedElement)) {
+ .contains((State)redefinedElement)) {
return true;
}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java
index 14c6045..c78760f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java
@@ -7305,7 +7305,7 @@
EReference eOpposite = eStructuralFeature.getEOpposite();
if (eOpposite != null
- && !featuresToDuplicate.contains(eOpposite)) {
+ && !featuresToDuplicate.contains((EStructuralFeature.Internal)eOpposite)) {
eOpposite.setEOpposite(null);
diff --git a/tests/org.eclipse.uml2.uml.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.uml2.uml.tests/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000..1731c16
--- /dev/null
+++ b/tests/org.eclipse.uml2.uml.tests/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+compilers.p.no-required-att=2
+compilers.p.unknown-attribute=2
+compilers.p.unknown-element=2
\ No newline at end of file
