diff options
159 files changed, 476 insertions, 195 deletions
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/src/org/eclipse/jpt/dbws/eclipselink/core/gen/Main.java b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/src/org/eclipse/jpt/dbws/eclipselink/core/gen/Main.java index 797c931eb6..bd956c46bb 100644 --- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/src/org/eclipse/jpt/dbws/eclipselink/core/gen/Main.java +++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/src/org/eclipse/jpt/dbws/eclipselink/core/gen/Main.java @@ -151,7 +151,7 @@ public class Main File builderFile = new File(builderFileName); if( ! (builderFile.exists() && builderFile.isFile())) { this.logMessage(SEVERE, - JptDbwsCoreMessages.UNABLE_TO_LOCATE_BUILDER_XML, builderFileName); //$NON-NLS-1$ + JptDbwsCoreMessages.UNABLE_TO_LOCATE_BUILDER_XML, builderFileName); return null; } return builderFile; diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/src/org/eclipse/jpt/dbws/eclipselink/core/gen/internal/JptDbwsCoreMessages.java b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/src/org/eclipse/jpt/dbws/eclipselink/core/gen/internal/JptDbwsCoreMessages.java index ff3fa9b9fb..5fccd5bef6 100644 --- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/src/org/eclipse/jpt/dbws/eclipselink/core/gen/internal/JptDbwsCoreMessages.java +++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/src/org/eclipse/jpt/dbws/eclipselink/core/gen/internal/JptDbwsCoreMessages.java @@ -15,6 +15,7 @@ import java.util.ResourceBundle; /** * Localized messages used by Dali DBWS generation core. */ +@SuppressWarnings("nls") public class JptDbwsCoreMessages { diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/src/org/eclipse/jpt/dbws/eclipselink/core/gen/internal/Tools.java b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/src/org/eclipse/jpt/dbws/eclipselink/core/gen/internal/Tools.java index 7a49d7aaae..b8ded7d1e7 100644 --- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/src/org/eclipse/jpt/dbws/eclipselink/core/gen/internal/Tools.java +++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/src/org/eclipse/jpt/dbws/eclipselink/core/gen/internal/Tools.java @@ -65,7 +65,7 @@ public final class Tools * Return a file representing the current working directory. */ public static File currentWorkingDirectory() { - return new File(USER_DIRECTORY); //$NON-NLS-1$ + return new File(USER_DIRECTORY); } /** diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/core/internal/gen/DbwsGenerator.java b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/core/internal/gen/DbwsGenerator.java index d709830630..c50d6510b7 100644 --- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/core/internal/gen/DbwsGenerator.java +++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/core/internal/gen/DbwsGenerator.java @@ -19,7 +19,6 @@ import org.eclipse.core.runtime.Path; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; import org.eclipse.jdt.launching.IRuntimeClasspathEntry; -import org.eclipse.jpt.common.core.gen.JptGenerator; import org.eclipse.jpt.common.core.internal.gen.AbstractJptGenerator; import org.eclipse.jpt.common.utility.internal.StringTools; diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/JaxbTestCase.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/JaxbTestCase.java index 383ae1912e..3278c7ba2b 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/JaxbTestCase.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/JaxbTestCase.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. + * Copyright (c) 2010, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -28,6 +28,7 @@ import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; +@SuppressWarnings("nls") public class JaxbTestCase extends AnnotationTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/SchemaLibraryTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/SchemaLibraryTests.java index eecf3ee5b2..5e5357d2df 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/SchemaLibraryTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/SchemaLibraryTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -18,6 +18,7 @@ import org.eclipse.jpt.jaxb.core.xsd.XsdSchema; +@SuppressWarnings("nls") public class SchemaLibraryTests extends JaxbTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/GenericContextRootTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/GenericContextRootTests.java index a95ce2cf30..5d6371b27a 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/GenericContextRootTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/GenericContextRootTests.java @@ -36,7 +36,6 @@ import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; import org.eclipse.jpt.jaxb.core.context.JaxbPackage; import org.eclipse.jpt.jaxb.core.context.java.JavaClass; -import org.eclipse.jpt.jaxb.core.context.java.JavaEnum; import org.eclipse.jpt.jaxb.core.context.java.JavaType; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; @@ -234,12 +233,12 @@ public class GenericContextRootTests public void testGetTypes() throws Exception { createClassWithXmlType(); assertEquals(1, IterableTools.size(getContextRoot().getJavaTypes())); - assertNotNull(((JavaClass) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); + assertNotNull((getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); //add an unannotated class and make sure it's not added to the context root createUnannotatedClassNamed("Foo"); assertEquals(1, IterableTools.size(getContextRoot().getJavaTypes())); - assertNotNull(((JavaClass) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); + assertNotNull((getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); //annotate the class with @XmlType and test it's added to the context root JavaResourceAbstractType fooResourceType = getJaxbProject().getJavaResourceType("test.Foo"); @@ -252,8 +251,8 @@ public class GenericContextRootTests }); assertEquals(2, IterableTools.size(getContextRoot().getJavaTypes())); - assertNotNull(((JavaClass) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); - assertNotNull(((JavaClass) getContextRoot().getJavaType("test.Foo"))); + assertNotNull((getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); + assertNotNull((getContextRoot().getJavaType("test.Foo"))); //remove the annotation from the class and test it's removed from the root context node annotatedElement.edit( @@ -264,20 +263,20 @@ public class GenericContextRootTests }); assertEquals(1, IterableTools.size(getContextRoot().getJavaTypes())); - assertNotNull(((JavaClass) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); - assertNull(((JavaClass) getContextRoot().getJavaType("test.Foo"))); + assertNotNull((getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); + assertNull((getContextRoot().getJavaType("test.Foo"))); } public void testGetTypes2() throws Exception { createEnumWithXmlType(); assertEquals(1, IterableTools.size(getContextRoot().getJavaTypes())); - assertNotNull(((JavaEnum) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); + assertNotNull((getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); //add an unannotated class and make sure it's not added to the context root createUnannotatedEnumNamed("Foo"); assertEquals(1, IterableTools.size(getContextRoot().getJavaTypes())); - assertNotNull(((JavaEnum) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); - assertNull(((JavaEnum) getContextRoot().getJavaType("test.Foo"))); + assertNotNull((getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); + assertNull((getContextRoot().getJavaType("test.Foo"))); //annotate the class with @XmlEnum and test it's added to the context root JavaResourceEnum fooResourceType = (JavaResourceEnum) getJaxbProject().getJavaResourceType("test.Foo", JavaResourceAbstractType.AstNodeType.ENUM); @@ -290,8 +289,8 @@ public class GenericContextRootTests }); assertEquals(2, IterableTools.size(getContextRoot().getJavaTypes())); - assertNotNull(((JavaEnum) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); - assertNotNull(((JavaEnum) getContextRoot().getJavaType("test.Foo"))); + assertNotNull((getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); + assertNotNull((getContextRoot().getJavaType("test.Foo"))); //remove the annotation from the class and test it's removed from the root context node annotatedElement.edit( @@ -302,8 +301,8 @@ public class GenericContextRootTests }); assertEquals(1, IterableTools.size(getContextRoot().getJavaTypes())); - assertNotNull(((JavaEnum) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); - assertNull(((JavaEnum) getContextRoot().getJavaType("test.Foo"))); + assertNotNull((getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); + assertNull((getContextRoot().getJavaType("test.Foo"))); } public void testDirectReferencedSuperclass() throws Exception { @@ -317,16 +316,16 @@ public class GenericContextRootTests createClassWithXmlTypeAndSuperclassNamed(superclassName); assertEquals(2, IterableTools.size(getContextRoot().getJavaTypes())); - assertNotNull(((JavaClass) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); - assertNotNull(((JavaClass) getContextRoot().getJavaType(fqSuperclassName))); + assertNotNull((getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); + assertNotNull((getContextRoot().getJavaType(fqSuperclassName))); // remove annotated class - both classes removed from context IFile file = (IFile) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME).getResource(); file.delete(true, null); assertTrue(IterableTools.isEmpty(getContextRoot().getJavaTypes())); - assertNull(((JavaClass) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); - assertNull(((JavaClass) getContextRoot().getJavaType(fqSuperclassName))); + assertNull((getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); + assertNull((getContextRoot().getJavaType(fqSuperclassName))); } public void testDirectReferencedAttribute() throws Exception { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java index 6e7af648d9..8068eab445 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -19,6 +19,7 @@ import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase; +@SuppressWarnings("nls") public class GenericJavaPersistentAttributeTests extends JaxbContextModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAdapterTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAdapterTests.java index 80d2531bf1..c27c1b88d3 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAdapterTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAdapterTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -25,6 +25,7 @@ import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase; +@SuppressWarnings("nls") public class GenericJavaXmlAdapterTests extends JaxbContextModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefMappingTests.java index e87213259f..0344fa8a02 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefMappingTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -34,6 +34,7 @@ import org.eclipse.jpt.jaxb.core.resource.java.XmlMixedAnnotation; import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase; +@SuppressWarnings("nls") public class GenericJavaXmlElementRefMappingTests extends JaxbContextModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefsMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefsMappingTests.java index fdc59ae25a..d7fcdbafdc 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefsMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefsMappingTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -36,6 +36,7 @@ import org.eclipse.jpt.jaxb.core.resource.java.XmlMixedAnnotation; import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase; +@SuppressWarnings("nls") public class GenericJavaXmlElementRefsMappingTests extends JaxbContextModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementsMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementsMappingTests.java index 0c86151499..774085f623 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementsMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementsMappingTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -31,6 +31,7 @@ import org.eclipse.jpt.jaxb.core.resource.java.XmlIDREFAnnotation; import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase; +@SuppressWarnings("nls") public class GenericJavaXmlElementsMappingTests extends JaxbContextModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTypeTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTypeTests.java index ec9483979e..e6c3b33332 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTypeTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTypeTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. + * Copyright (c) 2010, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -23,7 +23,7 @@ import org.eclipse.jpt.jaxb.core.context.XmlSchemaType; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlSchemaTypeAnnotation; import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase; -import org.eclipse.xsd.util.XSDUtil; +import org.eclipse.xsd.util.XSDConstants; @SuppressWarnings("nls") @@ -92,8 +92,8 @@ public class GenericJavaXmlSchemaTypeTests extends JaxbContextModelTestCase JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage(); assertNull(contextXmlSchemaType.getQName().getSpecifiedNamespace()); - assertEquals(XSDUtil.SCHEMA_FOR_SCHEMA_URI_2001, contextXmlSchemaType.getQName().getDefaultNamespace()); - assertEquals(XSDUtil.SCHEMA_FOR_SCHEMA_URI_2001, contextXmlSchemaType.getQName().getNamespace()); + assertEquals(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001, contextXmlSchemaType.getQName().getDefaultNamespace()); + assertEquals(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001, contextXmlSchemaType.getQName().getNamespace()); contextXmlSchemaType.getQName().setSpecifiedNamespace("foo"); XmlSchemaTypeAnnotation schemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourcePackage.getAnnotation(0, JAXB.XML_SCHEMA_TYPE); @@ -106,7 +106,7 @@ public class GenericJavaXmlSchemaTypeTests extends JaxbContextModelTestCase schemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourcePackage.getAnnotation(0, JAXB.XML_SCHEMA_TYPE); assertNull(schemaTypeAnnotation.getNamespace()); assertNull(contextXmlSchemaType.getQName().getSpecifiedNamespace()); - assertEquals(XSDUtil.SCHEMA_FOR_SCHEMA_URI_2001, contextXmlSchemaType.getQName().getNamespace()); + assertEquals(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001, contextXmlSchemaType.getQName().getNamespace()); } public void testUpdateNamespace() throws Exception { @@ -116,8 +116,8 @@ public class GenericJavaXmlSchemaTypeTests extends JaxbContextModelTestCase JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage(); assertNull(contextXmlSchemaType.getQName().getSpecifiedNamespace()); - assertEquals(XSDUtil.SCHEMA_FOR_SCHEMA_URI_2001, contextXmlSchemaType.getQName().getDefaultNamespace()); - assertEquals(XSDUtil.SCHEMA_FOR_SCHEMA_URI_2001, contextXmlSchemaType.getQName().getNamespace()); + assertEquals(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001, contextXmlSchemaType.getQName().getDefaultNamespace()); + assertEquals(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001, contextXmlSchemaType.getQName().getNamespace()); //add a namespace member value pair AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSeeAlsoTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSeeAlsoTests.java index 76b5b25435..4b5d3ecc84 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSeeAlsoTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSeeAlsoTests.java @@ -27,6 +27,7 @@ import org.eclipse.jpt.jaxb.core.resource.java.XmlSeeAlsoAnnotation; import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase; +@SuppressWarnings("nls") public class GenericJavaXmlSeeAlsoTests extends JaxbContextModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/projects/TestJaxbProject.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/projects/TestJaxbProject.java index a7b2c321c9..90caf322de 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/projects/TestJaxbProject.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/projects/TestJaxbProject.java @@ -33,6 +33,7 @@ import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; * The JPA project's settings (platform, database connection, etc.) can be * controlled by building a data model and passing it into the constructor. */ +@SuppressWarnings("nls") public class TestJaxbProject extends TestJavaProject { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbIndexResourceTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbIndexResourceTests.java index c6a657fdcc..f8ffdc68d8 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbIndexResourceTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbIndexResourceTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -22,6 +22,7 @@ import org.eclipse.jpt.jaxb.core.internal.resource.jaxbindex.JaxbIndexResourceMo import org.eclipse.jpt.jaxb.core.resource.jaxbindex.JaxbIndexResource; +@SuppressWarnings("nls") public class JaxbIndexResourceTests extends AnnotationTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbPropertiesResourceTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbPropertiesResourceTests.java index bc0684fc7a..62d3422847 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbPropertiesResourceTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbPropertiesResourceTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -20,6 +20,7 @@ import org.eclipse.jpt.jaxb.core.internal.resource.jaxbprops.JaxbPropertiesResou import org.eclipse.jpt.jaxb.core.resource.jaxbprops.JaxbPropertiesResource; +@SuppressWarnings("nls") public class JaxbPropertiesResourceTests extends AnnotationTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementRefsAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementRefsAnnotationTests.java index 08322aba24..5b8c121272 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementRefsAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementRefsAnnotationTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -20,6 +20,7 @@ import org.eclipse.jpt.jaxb.core.resource.java.XmlElementRefAnnotation; import org.eclipse.jpt.jaxb.core.resource.java.XmlElementRefsAnnotation; +@SuppressWarnings("nls") public class XmlElementRefsAnnotationTests extends JaxbJavaResourceModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementsAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementsAnnotationTests.java index 5ebb568d0b..a8c596d124 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementsAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementsAnnotationTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -20,6 +20,7 @@ import org.eclipse.jpt.jaxb.core.resource.java.XmlElementAnnotation; import org.eclipse.jpt.jaxb.core.resource.java.XmlElementsAnnotation; +@SuppressWarnings("nls") public class XmlElementsAnnotationTests extends JaxbJavaResourceModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/ELJaxbContextRootTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/ELJaxbContextRootTests.java index a8b9307ca7..554d5eca1c 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/ELJaxbContextRootTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/ELJaxbContextRootTests.java @@ -12,7 +12,8 @@ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context; import java.io.ByteArrayInputStream;
import org.eclipse.core.resources.IFile;
import org.eclipse.jpt.jaxb.eclipselink.core.context.ELJaxbContextRoot;
- +
+@SuppressWarnings("nls") public class ELJaxbContextRootTests
extends ELJaxbContextModelTestCase {
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyAttributeMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyAttributeMappingTests.java index 411167ddb6..e15d95f141 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyAttributeMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyAttributeMappingTests.java @@ -26,6 +26,7 @@ import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase; +@SuppressWarnings("nls") public class ELJavaXmlAnyAttributeMappingTests extends ELJaxbContextModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyElementMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyElementMappingTests.java index 8887f87c3c..f2b4c46d07 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyElementMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyElementMappingTests.java @@ -25,7 +25,7 @@ import org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java.ELJavaXmlAnyE import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase; - +@SuppressWarnings("nls") public class ELJavaXmlAnyElementMappingTests extends ELJaxbContextModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAttributeMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAttributeMappingTests.java index f9233c8de5..404844770d 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAttributeMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAttributeMappingTests.java @@ -29,7 +29,7 @@ import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlPathAnnotation; import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase; - +@SuppressWarnings("nls") public class ELJavaXmlAttributeMappingTests extends ELJaxbContextModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorNodeTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorNodeTests.java index cc2227c938..03dfe8c947 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorNodeTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorNodeTests.java @@ -27,7 +27,7 @@ import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlDiscriminatorNodeAnnotation; import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase; - +@SuppressWarnings("nls") public class ELJavaXmlDiscriminatorNodeTests extends ELJaxbContextModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorValueTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorValueTests.java index 5622e8f7a3..352152cd96 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorValueTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorValueTests.java @@ -1,3 +1,12 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Oracle - initial API and implementation + *******************************************************************************/ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java; import java.util.Iterator; @@ -18,7 +27,7 @@ import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlDiscriminatorValueAnnotation; import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase; - +@SuppressWarnings("nls") public class ELJavaXmlDiscriminatorValueTests extends ELJaxbContextModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementMappingTests.java index 3f84e1f4c8..c8866ab5ba 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementMappingTests.java @@ -29,6 +29,7 @@ import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlPathAnnotation; import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase; +@SuppressWarnings("nls") public class ELJavaXmlElementMappingTests extends ELJaxbContextModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementsMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementsMappingTests.java index e54e6e45d2..660bcdf183 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementsMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementsMappingTests.java @@ -1,3 +1,12 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Oracle - initial API and implementation + *******************************************************************************/ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java; import java.util.Iterator; @@ -20,7 +29,7 @@ import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlPathAnnotation; import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase; - +@SuppressWarnings("nls") public class ELJavaXmlElementsMappingTests extends ELJaxbContextModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlInverseReferenceMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlInverseReferenceMappingTests.java index a0d1bb0a2b..d75e640459 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlInverseReferenceMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlInverseReferenceMappingTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -28,6 +28,7 @@ import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlInverseReferenceAnnotation; import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase; +@SuppressWarnings("nls") public class ELJavaXmlInverseReferenceMappingTests extends ELJaxbContextModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodeTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodeTests.java index ddcdeb4d93..521cf117b7 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodeTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodeTests.java @@ -1,3 +1,12 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Oracle - initial API and implementation + *******************************************************************************/ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java; import java.util.Iterator; @@ -21,7 +30,7 @@ import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlJoinNodeAnnotation; import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase; - +@SuppressWarnings("nls") public class ELJavaXmlJoinNodeTests extends ELJaxbContextModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodesMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodesMappingTests.java index 7926b3a507..3af9826017 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodesMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodesMappingTests.java @@ -1,3 +1,12 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Oracle - initial API and implementation + *******************************************************************************/ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java; import java.util.Iterator; @@ -22,7 +31,7 @@ import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlJoinNodeAnnotation; import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase; - +@SuppressWarnings("nls") public class ELJavaXmlJoinNodesMappingTests extends ELJaxbContextModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlPathTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlPathTests.java index 4c9a63e0cc..633f944bc1 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlPathTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlPathTests.java @@ -1,3 +1,12 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Oracle - initial API and implementation + *******************************************************************************/ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java; import java.util.Iterator; @@ -19,7 +28,7 @@ import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlPathAnnotation; import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase; - +@SuppressWarnings("nls") public class ELJavaXmlPathTests extends ELJaxbContextModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlValueMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlValueMappingTests.java index 755539a205..bdabbacfb9 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlValueMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlValueMappingTests.java @@ -1,3 +1,12 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Oracle - initial API and implementation + *******************************************************************************/ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java; import java.util.Iterator; @@ -18,7 +27,7 @@ import org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java.ELJavaXmlValu import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase; - +@SuppressWarnings("nls") public class ELJavaXmlValueMappingTests extends ELJaxbContextModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmContextModelTestCase.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmContextModelTestCase.java index f9cd25514a..377a7ceac0 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmContextModelTestCase.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmContextModelTestCase.java @@ -15,7 +15,8 @@ import java.io.InputStream; import java.io.InputStreamReader;
import org.eclipse.core.resources.IFile;
import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase;
- +
+@SuppressWarnings("nls") public class OxmContextModelTestCase
extends ELJaxbContextModelTestCase {
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmJavaTypeTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmJavaTypeTests.java index 4f8e43a25f..816369129a 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmJavaTypeTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmJavaTypeTests.java @@ -16,7 +16,8 @@ import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaType; import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmXmlBindings;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings;
- +
+@SuppressWarnings("nls") public class OxmJavaTypeTests
extends OxmContextModelTestCase {
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmXmlBindingsTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmXmlBindingsTests.java index 4b77906794..69522ff199 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmXmlBindingsTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmXmlBindingsTests.java @@ -23,7 +23,7 @@ import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessOrder; import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessType;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmFactory;
- +@SuppressWarnings("nls") public class OxmXmlBindingsTests
extends OxmContextModelTestCase {
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlCDATAAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlCDATAAnnotationTests.java index a652353c05..4b91331f6d 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlCDATAAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlCDATAAnnotationTests.java @@ -21,7 +21,7 @@ import org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2.ELJaxb_2_2_PlatformDe import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlCDATAAnnotation; - +@SuppressWarnings("nls") public class XmlCDATAAnnotationTests extends ELJaxbJavaResourceModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlDiscriminatorNodeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlDiscriminatorNodeAnnotationTests.java index 0a2c88c24c..300a84cf07 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlDiscriminatorNodeAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlDiscriminatorNodeAnnotationTests.java @@ -19,7 +19,7 @@ import org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2.ELJaxb_2_2_PlatformDe import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlDiscriminatorNodeAnnotation; - +@SuppressWarnings("nls") public class XmlDiscriminatorNodeAnnotationTests extends ELJaxbJavaResourceModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlDiscriminatorValueAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlDiscriminatorValueAnnotationTests.java index b680b3020a..ea9f5e35a1 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlDiscriminatorValueAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlDiscriminatorValueAnnotationTests.java @@ -19,7 +19,7 @@ import org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2.ELJaxb_2_2_PlatformDe import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlDiscriminatorValueAnnotation; - +@SuppressWarnings("nls") public class XmlDiscriminatorValueAnnotationTests extends ELJaxbJavaResourceModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlInverseReferenceAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlInverseReferenceAnnotationTests.java index 7336892bf0..7b38d5dba8 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlInverseReferenceAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlInverseReferenceAnnotationTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -18,7 +18,7 @@ import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlInverseReferenceAnnotation; - +@SuppressWarnings("nls") public class XmlInverseReferenceAnnotationTests extends ELJaxbJavaResourceModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlJoinNodeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlJoinNodeAnnotationTests.java index 6bcd1dbc08..bd60e85a46 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlJoinNodeAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlJoinNodeAnnotationTests.java @@ -21,7 +21,7 @@ import org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2.ELJaxb_2_2_PlatformDe import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlJoinNodeAnnotation; - +@SuppressWarnings("nls") public class XmlJoinNodeAnnotationTests extends ELJaxbJavaResourceModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlKeyAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlKeyAnnotationTests.java index b03bd795b6..b2abce66c4 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlKeyAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlKeyAnnotationTests.java @@ -21,7 +21,7 @@ import org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2.ELJaxb_2_2_PlatformDe import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlKeyAnnotation; - +@SuppressWarnings("nls") public class XmlKeyAnnotationTests extends ELJaxbJavaResourceModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlPathAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlPathAnnotationTests.java index 737cfcf138..fbbd6b0fa0 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlPathAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlPathAnnotationTests.java @@ -1,3 +1,12 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Oracle - initial API and implementation + *******************************************************************************/ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.java; import java.util.Iterator; @@ -10,7 +19,7 @@ import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlPathAnnotation; - +@SuppressWarnings("nls") public class XmlPathAnnotationTests extends ELJaxbJavaResourceModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlTransformationAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlTransformationAnnotationTests.java index 87228d5176..25ee6920dc 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlTransformationAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlTransformationAnnotationTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -21,7 +21,7 @@ import org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2.ELJaxb_2_2_PlatformDe import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlTransformationAnnotation; - +@SuppressWarnings("nls") public class XmlTransformationAnnotationTests extends ELJaxbJavaResourceModelTestCase { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/oxm/OxmResourceTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/oxm/OxmResourceTests.java index 96e59237b2..9d5ed5f145 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/oxm/OxmResourceTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/oxm/OxmResourceTests.java @@ -1,3 +1,12 @@ +/*******************************************************************************
+ * Copyright (c) 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.oxm;
import java.io.ByteArrayInputStream;
@@ -12,6 +21,7 @@ import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute; import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNullPolicy;
+@SuppressWarnings("nls")
public class OxmResourceTests
extends JavaResourceModelTestCase {
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/JPADiagramEditor.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/JPADiagramEditor.java index b9facc112a..1c260b28c2 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/JPADiagramEditor.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/JPADiagramEditor.java @@ -140,6 +140,7 @@ public class JPADiagramEditor extends DiagramEditor implements JpaEditorManager{ final Wrp wrp = new Wrp(); TransactionalEditingDomain ted = TransactionUtil.getEditingDomain(d); ted.getCommandStack().execute(new RecordingCommand(ted) { + @Override protected void doExecute() { JPACheckSum.INSTANCE().assignEntityShapesMD5Strings(d, ModelIntegrationUtil.getProjectByDiagram(d.getName())); List<Shape> children = d.getChildren(); @@ -178,6 +179,7 @@ public class JPADiagramEditor extends DiagramEditor implements JpaEditorManager{ return; } ted.getCommandStack().execute(new RecordingCommand(ted) { + @Override protected void doExecute() { JPACheckSum.INSTANCE().assignEntityShapesMD5Strings(d, ModelIntegrationUtil.getProjectByDiagram(d.getName())); List<Shape> children = d.getChildren(); @@ -266,6 +268,7 @@ public class JPADiagramEditor extends DiagramEditor implements JpaEditorManager{ } } + @Override public void init(IEditorSite site, IEditorInput input) throws PartInitException { IFile entityFile = (IFile) input.getAdapter(IFile.class); diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/JPADiagramEditorPlugin.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/JPADiagramEditorPlugin.java index 8cd63461ca..3eb2de10c1 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/JPADiagramEditorPlugin.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/JPADiagramEditorPlugin.java @@ -51,6 +51,7 @@ public class JPADiagramEditorPlugin extends AbstractUIPlugin { * (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) */ + @Override public void start(BundleContext context) throws Exception { super.start(context); plugin = this; @@ -64,6 +65,7 @@ public class JPADiagramEditorPlugin extends AbstractUIPlugin { * (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) */ + @Override public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context); diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/AddAttributeCommand.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/AddAttributeCommand.java index a7d6b5297e..8bad938b36 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/AddAttributeCommand.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/AddAttributeCommand.java @@ -188,7 +188,7 @@ public class AddAttributeCommand implements Command { contents = attrFieldContent;
}
- type.createField(contents, null, false, new NullProgressMonitor()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ type.createField(contents, null, false, new NullProgressMonitor());
type.createMethod(
genGetterContents(attributeName, attributeType, actName, attrTypeElementNames, annotationContents), null,
@@ -317,7 +317,7 @@ public class AddAttributeCommand implements Command { + actName.substring(1);
String contents = " public " + JPAEditorUtil.returnSimpleName(type) + //$NON-NLS-1$
"<" //$NON-NLS-1$
- + ((mapKeyType != null) ? (mapKeyType + ", ") : "") + attrType + "> " + //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ + ((mapKeyType != null) ? (mapKeyType + ", ") : "") + attrType + "> " + //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
"get" + attrNameWithCapitalA + "() {\n" + //$NON-NLS-1$ //$NON-NLS-2$
" return " //$NON-NLS-1$
+ JPAEditorUtil.decapitalizeFirstLetter(actName) + ";\n" + //$NON-NLS-1$
@@ -348,11 +348,11 @@ public class AddAttributeCommand implements Command { String contents = " public void set" + attrNameWithCapitalA + //$NON-NLS-1$
"(" //$NON-NLS-1$
+ JPAEditorUtil.returnSimpleName(type)
- + //$NON-NLS-1$
+ +
"<" //$NON-NLS-1$
- + ((mapKeyType != null) ? (mapKeyType + ", ") : "") + attrType + "> param) " + //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ + ((mapKeyType != null) ? (mapKeyType + ", ") : "") + attrType + "> param) " + //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
"{\n" //$NON-NLS-1$
- + //$NON-NLS-1$
+ +
" this." //$NON-NLS-1$
+ JPAEditorUtil.decapitalizeFirstLetter(actName)
+ " = param;\n" + //$NON-NLS-1$
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/CreateEntityTypeHierarchy.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/CreateEntityTypeHierarchy.java index ad908629bd..74e195a222 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/CreateEntityTypeHierarchy.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/CreateEntityTypeHierarchy.java @@ -74,11 +74,9 @@ public class CreateEntityTypeHierarchy implements Command { edit.addChild(new DeleteEdit(offset, length));
}
- if (edit != null) {
- TextEditCopier copier = new TextEditCopier(edit);
- TextEdit copy = copier.perform();
- subCU.applyTextEdit(copy, new NullProgressMonitor());
- }
+ TextEditCopier copier = new TextEditCopier(edit);
+ TextEdit copy = copier.perform();
+ subCU.applyTextEdit(copy, new NullProgressMonitor());
} catch (CoreException exception) {
JPADiagramEditorPlugin.logError(exception);
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/DeleteAttributeCommand.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/DeleteAttributeCommand.java index 1e42dc2300..5252dbd526 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/DeleteAttributeCommand.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/DeleteAttributeCommand.java @@ -72,8 +72,9 @@ public class DeleteAttributeCommand implements Command { new String[0]);
}
try {
- if ((getAttributeMethod != null) && getAttributeMethod.exists());
+ if ((getAttributeMethod != null) && getAttributeMethod.exists()) {
typeSignature = getAttributeMethod.getReturnType();
+ }
} catch (JavaModelException e1) {
JPADiagramEditorPlugin.logError("Cannot obtain the type of the getter with name " + methodName + "()", e1); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -95,7 +96,7 @@ public class DeleteAttributeCommand implements Command { JPADiagramEditorPlugin.logError("Cannot remove the attribute field with name " + attributeName, e); //$NON-NLS-1$
}
try {
- methodName = getterPrefix + attrNameWithCapitalLetter; //$NON-NLS-1$
+ methodName = getterPrefix + attrNameWithCapitalLetter;
if (getAttributeMethod != null) {
typeSignature = getAttributeMethod.getReturnType();
if (getAttributeMethod.exists())
@@ -106,7 +107,7 @@ public class DeleteAttributeCommand implements Command { }
} else {
try {
- methodName = getterPrefix + attrNameWithCapitalLetter; //$NON-NLS-1$
+ methodName = getterPrefix + attrNameWithCapitalLetter;
if (getAttributeMethod.exists()) {
typeSignature = getAttributeMethod.getReturnType();
getAttributeMethod.delete(true, new NullProgressMonitor());
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/RenameAttributeCommand.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/RenameAttributeCommand.java index 9e6e5c7be2..d9f770193e 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/RenameAttributeCommand.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/RenameAttributeCommand.java @@ -78,12 +78,12 @@ public class RenameAttributeCommand implements Command { attributeField = javaType.getField(oldName);
}
String getterPrefix = "get"; //$NON-NLS-1$
- String methodName = getterPrefix + JPAEditorUtil.capitalizeFirstLetter(oldName); //$NON-NLS-1$
+ String methodName = getterPrefix + JPAEditorUtil.capitalizeFirstLetter(oldName);
IMethod getter = javaType.getMethod(methodName, new String[0]);
if (!getter.exists()) {
getterPrefix = "is"; //$NON-NLS-1$
}
- methodName = getterPrefix + JPAEditorUtil.capitalizeFirstLetter(oldName); //$NON-NLS-1$
+ methodName = getterPrefix + JPAEditorUtil.capitalizeFirstLetter(oldName);
getter = javaType.getMethod(methodName, new String[0]);
if (isMethodAnnotated) {
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/dialog/SelectTypeDialog.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/dialog/SelectTypeDialog.java index 434ed4dda1..28cc37e17c 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/dialog/SelectTypeDialog.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/dialog/SelectTypeDialog.java @@ -86,19 +86,22 @@ public class SelectTypeDialog extends TitleAreaDialog { this.type = initialType; } - protected Control createContents(Composite parent) { + @Override + protected Control createContents(Composite parent) { Control contents = super.createContents(parent); initializeControls(); validatePage(); return contents; } - protected void configureShell(Shell shell) { + @Override + protected void configureShell(Shell shell) { super.configureShell(shell); shell.setText(JPAEditorMessages.SelectTypeDialog_chooseAttributeTypeDialogWindowTitle); } + @Override protected Point getInitialSize() { return new Point(convertHorizontalDLUsToPixels(320), convertVerticalDLUsToPixels(120)); @@ -108,11 +111,13 @@ public class SelectTypeDialog extends TitleAreaDialog { return type; } + @Override protected void buttonPressed(int buttonId) { type = text.getText().trim(); super.buttonPressed(buttonId); } + @Override protected boolean isResizable() { return true; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddAllEntitiesFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddAllEntitiesFeature.java index 70fe35a43c..3cd175efe3 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddAllEntitiesFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddAllEntitiesFeature.java @@ -187,6 +187,7 @@ public class AddAllEntitiesFeature extends AbstractCustomFeature implements IAdd return JPAEditorMessages.JPAEditorToolBehaviorProvider_showAllTheEntities; } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider) super.getFeatureProvider(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddAttributeFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddAttributeFeature.java index 3ea2b4f0f5..640e2441df 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddAttributeFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddAttributeFeature.java @@ -67,6 +67,7 @@ public class AddAttributeFeature extends AbstractAddShapeFeature { TransactionalEditingDomain ted = TransactionUtil.getEditingDomain(context.getTargetContainer()); final Wrp wrp = new Wrp(); ted.getCommandStack().execute(new RecordingCommand(ted) { + @Override protected void doExecute() { ContainerShape textShape = graphicalAdd(context.getTargetContainer(), newAttr); expand(newAttr); @@ -104,6 +105,7 @@ public class AddAttributeFeature extends AbstractAddShapeFeature { } } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider) super.getFeatureProvider(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddHasReferenceRelationFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddHasReferenceRelationFeature.java index 16ac69218d..ca8d9877a8 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddHasReferenceRelationFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddHasReferenceRelationFeature.java @@ -71,6 +71,7 @@ public class AddHasReferenceRelationFeature extends AbstractAddFeature { TransactionalEditingDomain ted = TransactionUtil.getEditingDomain(diagram);
RecordingCommand rc = new RecordingCommand(ted) {
+ @Override
protected void doExecute() {
FreeFormConnection connection = createConnection(addConContext, relation, diagram);
imageCreator.createHasReferenceConnectionLine(diagram, connection);
@@ -109,6 +110,7 @@ public class AddHasReferenceRelationFeature extends AbstractAddFeature { return connection;
}
+ @Override
public IJPAEditorFeatureProvider getFeatureProvider() {
return (IJPAEditorFeatureProvider)super.getFeatureProvider();
}
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddInheritedEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddInheritedEntityFeature.java index 0e82104ba3..7d3caec35a 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddInheritedEntityFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddInheritedEntityFeature.java @@ -70,6 +70,7 @@ public class AddInheritedEntityFeature extends AbstractAddFeature { TransactionalEditingDomain ted = TransactionUtil.getEditingDomain(diagram); RecordingCommand rc = new RecordingCommand(ted) { + @Override protected void doExecute() { FreeFormConnection connection = createConnection(addConContext, diagram); imageCreator.createIsAConnectionLine(diagram, connection); @@ -107,6 +108,7 @@ public class AddInheritedEntityFeature extends AbstractAddFeature { return connection; } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider)super.getFeatureProvider(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddJPAEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddJPAEntityFeature.java index 27ecc1695b..ca9c47812a 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddJPAEntityFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddJPAEntityFeature.java @@ -258,8 +258,8 @@ public class AddJPAEntityFeature extends AbstractAddShapeFeature { private Rectangle addCompartmentRectangle(int y, int width, ContainerShape containerShape) { Rectangle rect = Graphiti.getGaService().createRectangle(containerShape); - rect.setFilled(false); - rect.setLineVisible(false); + rect.setFilled(Boolean.FALSE); + rect.setLineVisible(Boolean.FALSE); rect.setHeight(0); rect.setWidth(width); rect.setX(0); @@ -370,8 +370,8 @@ public class AddJPAEntityFeature extends AbstractAddShapeFeature { ContainerShape headerIconShape = Graphiti.getPeService().createContainerShape( entityShape, false); Rectangle iconRect = Graphiti.getGaService().createRectangle(headerIconShape); - iconRect.setFilled(false); - iconRect.setLineVisible(false); + iconRect.setFilled(Boolean.FALSE); + iconRect.setLineVisible(Boolean.FALSE); iconRect.setHeight(JPAEditorConstants.ICON_RECT_HEIGHT); iconRect.setX(0); iconRect.setWidth(JPAEditorConstants.HEADER_ICON_RECT_WIDTH); @@ -393,8 +393,8 @@ public class AddJPAEntityFeature extends AbstractAddShapeFeature { JPAEditorConstants.PROP_SHAPE_TYPE, ShapeType.HEADER .toString()); Rectangle headerRect = Graphiti.getGaService().createRectangle(entityHeaderTextShape); - headerRect.setFilled(false); - headerRect.setLineVisible(false); + headerRect.setFilled(Boolean.FALSE); + headerRect.setLineVisible(Boolean.FALSE); headerRect.setWidth(width - JPAEditorConstants.HEADER_TEXT_RECT_WIDTH_REDUCER); headerRect.setHeight(JPAEditorConstants.HEADER_TEXT_RECT_HEIGHT); headerRect.setY(2); diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddRelationFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddRelationFeature.java index 0f8498d42b..ad8216db92 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddRelationFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddRelationFeature.java @@ -81,6 +81,7 @@ public class AddRelationFeature extends AbstractAddFeature { final Wrp wrp = new Wrp(); TransactionalEditingDomain ted = TransactionUtil.getEditingDomain(diagram); RecordingCommand rc = new RecordingCommand(ted) { + @Override protected void doExecute() { FreeFormConnection connection = createConnection(addConContext, relation, diagram); imageCreator.createConnectionLine(diagram, connection); @@ -262,6 +263,7 @@ public class AddRelationFeature extends AbstractAddFeature { return false; } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider)super.getFeatureProvider(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickAddAttributeButtonFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickAddAttributeButtonFeature.java index 8cc319bc9f..93781e0386 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickAddAttributeButtonFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickAddAttributeButtonFeature.java @@ -36,10 +36,12 @@ public class ClickAddAttributeButtonFeature extends AbstractCreateFeature { super(provider, "", ""); //$NON-NLS-1$ //$NON-NLS-2$ } + @Override public boolean canExecute(IContext context) { return true; } + @Override public boolean canUndo(IContext context) { return false; } @@ -66,18 +68,22 @@ public class ClickAddAttributeButtonFeature extends AbstractCreateFeature { return new Object[] {newAttr}; } + @Override public boolean isAvailable(IContext context) { return true; } + @Override public String getName() { return JPAEditorMessages.ClickAddAttributeButtonFeature_createAttributeButtonLabel; } + @Override public String getDescription() { return JPAEditorMessages.ClickAddAttributeButtonFeature_createAttributeButtonDescription; } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider)super.getFeatureProvider(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickAddElementCollectionButtonFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickAddElementCollectionButtonFeature.java index ac1e6d888b..bd2a9da15d 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickAddElementCollectionButtonFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickAddElementCollectionButtonFeature.java @@ -38,10 +38,12 @@ public class ClickAddElementCollectionButtonFeature extends AbstractCreateFeatur super(provider, "", ""); //$NON-NLS-1$ //$NON-NLS-2$
}
+ @Override
public boolean canExecute(IContext context) {
return true;
}
+ @Override
public boolean canUndo(IContext context) {
return false;
}
@@ -70,18 +72,22 @@ public class ClickAddElementCollectionButtonFeature extends AbstractCreateFeatur return new Object[] {newAttr};
}
+ @Override
public boolean isAvailable(IContext context) {
return true;
}
+ @Override
public String getName() {
return JPAEditorMessages.ClickAddElementCollectionButtonFeature_CreateElementCollectionAttributeFeatureName;
}
+ @Override
public String getDescription() {
return JPAEditorMessages.ClickAddElementCollectionButtonFeature_CreateElementCollectionAttributeFeatureDescription;
}
+ @Override
public IJPAEditorFeatureProvider getFeatureProvider() {
return (IJPAEditorFeatureProvider)super.getFeatureProvider();
}
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickRemoveAttributeButtonFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickRemoveAttributeButtonFeature.java index 5f117af542..506e4a4068 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickRemoveAttributeButtonFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickRemoveAttributeButtonFeature.java @@ -45,6 +45,7 @@ public class ClickRemoveAttributeButtonFeature extends DefaultDeleteFeature { } + @Override public boolean canUndo(IContext context) { return false; } @@ -61,7 +62,8 @@ public class ClickRemoveAttributeButtonFeature extends DefaultDeleteFeature { JpaArtifactFactory.instance().deleteAttribute(jpt, attrName, getFeatureProvider()); } - public void delete(IDeleteContext context) { + @Override + public void delete(IDeleteContext context) { delete(context, true); } @@ -91,7 +93,8 @@ public class ClickRemoveAttributeButtonFeature extends DefaultDeleteFeature { } - protected void deleteBusinessObjects(Object[] businessObjects) { + @Override + protected void deleteBusinessObjects(Object[] businessObjects) { if (businessObjects != null) { for (Object bo : businessObjects) { deleteBusinessObject(bo); @@ -99,18 +102,22 @@ public class ClickRemoveAttributeButtonFeature extends DefaultDeleteFeature { } } + @Override public boolean isAvailable(IContext context) { return true; } + @Override public String getName() { return JPAEditorMessages.ClickRemoveAttributeButtonFeature_createAttributeButtonlabel; } + @Override public String getDescription() { return JPAEditorMessages.ClickRemoveAttributeButtonFeature_createAttributeButtonDescription; } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider)super.getFeatureProvider(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CollapseAllEntitiesFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CollapseAllEntitiesFeature.java index 15bbd93ea9..8bc4b90132 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CollapseAllEntitiesFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CollapseAllEntitiesFeature.java @@ -47,6 +47,7 @@ public class CollapseAllEntitiesFeature extends AbstractCustomFeature implements final EList<Shape> entShapes = diagram.getChildren(); TransactionalEditingDomain ted = TransactionUtil.getEditingDomain(diagram); ted.getCommandStack().execute(new RecordingCommand(ted) { + @Override protected void doExecute() { for (final PictogramElement el : entShapes) { String collapseFeatures = Graphiti.getPeService().getPropertyValue(el, JPAEditorConstants.COLLAPSE_FEATURES); @@ -67,6 +68,7 @@ public class CollapseAllEntitiesFeature extends AbstractCustomFeature implements return true; } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider)super.getFeatureProvider(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CollapseCompartmentShapeFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CollapseCompartmentShapeFeature.java index c0fb9c44d8..df969d7c26 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CollapseCompartmentShapeFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CollapseCompartmentShapeFeature.java @@ -46,6 +46,7 @@ public class CollapseCompartmentShapeFeature extends AbstractCustomFeature{ final GraphicsAlgorithm algo = el.getGraphicsAlgorithm(); TransactionalEditingDomain ted = TransactionUtil.getEditingDomain(algo); ted.getCommandStack().execute(new RecordingCommand(ted) { + @Override protected void doExecute() { algo.setHeight(JPAEditorConstants.COMPARTMENT_MIN_HEIGHT); GraphicsUpdater.updateEntityShape(entityShape); @@ -60,6 +61,7 @@ public class CollapseCompartmentShapeFeature extends AbstractCustomFeature{ return true; } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider)super.getFeatureProvider(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CollapseEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CollapseEntityFeature.java index ac695dde29..b1d1d64abe 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CollapseEntityFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CollapseEntityFeature.java @@ -48,6 +48,7 @@ public class CollapseEntityFeature extends AbstractCustomFeature implements ICus TransactionalEditingDomain ted = TransactionUtil.getEditingDomain(algo); ted.getCommandStack().execute(new RecordingCommand(ted) { + @Override protected void doExecute() { algo.setHeight(JPAEditorConstants.ENTITY_MIN_HEIGHT); Graphiti.getPeService().setPropertyValue(el, JPAEditorConstants.COLLAPSE_FEATURES, String.valueOf(JPAEditorConstants.ENTITY_MIN_HEIGHT)); @@ -61,6 +62,7 @@ public class CollapseEntityFeature extends AbstractCustomFeature implements ICus return true; } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider)super.getFeatureProvider(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateEmbeddableFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateEmbeddableFeature.java index 7f73f3eb15..84f76a6cfb 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateEmbeddableFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateEmbeddableFeature.java @@ -113,10 +113,12 @@ public class CreateEmbeddableFeature extends AbstractCreateFeature { return new Object[] {};
}
+ @Override
public String getCreateImageId() {
return JPAEditorImageProvider.ADD_EMBEDDABLE;
}
+ @Override
public IJPAEditorFeatureProvider getFeatureProvider() {
return (IJPAEditorFeatureProvider) super.getFeatureProvider();
}
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateInheritedEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateInheritedEntityFeature.java index 6947fa7d9d..54026d3348 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateInheritedEntityFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateInheritedEntityFeature.java @@ -89,7 +89,8 @@ public class CreateInheritedEntityFeature extends AbstractCreateConnectionFeatur return true; } - public String getCreateImageId() { + @Override + public String getCreateImageId() { return JPAEditorImageProvider.ADD_INHERITED_ENTITY; } @@ -104,6 +105,7 @@ public class CreateInheritedEntityFeature extends AbstractCreateConnectionFeatur return null; } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider)super.getFeatureProvider(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateIsARelationFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateIsARelationFeature.java index 8d5eeb5347..3d30693f78 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateIsARelationFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateIsARelationFeature.java @@ -108,7 +108,8 @@ public class CreateIsARelationFeature extends AbstractCreateConnectionFeature { return true;
}
- public String getCreateImageId() {
+ @Override
+ public String getCreateImageId() {
return JPAEditorImageProvider.ICON_DERIVE_JPT;
}
@@ -123,6 +124,7 @@ public class CreateIsARelationFeature extends AbstractCreateConnectionFeature { return null;
}
+ @Override
public IJPAEditorFeatureProvider getFeatureProvider() {
return (IJPAEditorFeatureProvider)super.getFeatureProvider();
}
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateJPAEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateJPAEntityFeature.java index db45096d71..5520b3428b 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateJPAEntityFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateJPAEntityFeature.java @@ -136,7 +136,7 @@ public class CreateJPAEntityFeature extends AbstractCreateFeature { if (mappedSuperclass != null) { this.getFeatureProvider(). getJPAEditorUtil(). - createEntityInProject(targetProject, entityName, mappedSuperclass); //$NON-NLS-1$ + createEntityInProject(targetProject, entityName, mappedSuperclass); } else { this.getFeatureProvider(). getJPAEditorUtil(). @@ -176,9 +176,8 @@ public class CreateJPAEntityFeature extends AbstractCreateFeature { ICompilationUnit cu = getFeatureProvider().getCompilationUnit(jpt); getFeatureProvider().getJPAEditorUtil().formatCode(cu, ws); return new Object[] { jpt }; - } else { - JPADiagramEditorPlugin.logError("The JPA entity " + entityName + " could not be created", new Exception()); //$NON-NLS-1$ //$NON-NLS-2$ - } + } + JPADiagramEditorPlugin.logError("The JPA entity " + entityName + " could not be created", new Exception()); //$NON-NLS-1$ //$NON-NLS-2$ return new Object[] {}; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateManyToManyBiDirRelationFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateManyToManyBiDirRelationFeature.java index db16e24e0f..06faadc59b 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateManyToManyBiDirRelationFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateManyToManyBiDirRelationFeature.java @@ -60,7 +60,8 @@ public class CreateManyToManyBiDirRelationFeature extends CreateManyToManyRelati } - public String getCreateImageId() { + @Override + public String getCreateImageId() { return JPAEditorImageProvider.ICON_MANY_TO_MANY_2_DIR; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateManyToManyUniDirRelationFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateManyToManyUniDirRelationFeature.java index 81fe2d39db..a1050dd361 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateManyToManyUniDirRelationFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateManyToManyUniDirRelationFeature.java @@ -52,7 +52,8 @@ public class CreateManyToManyUniDirRelationFeature extends CreateManyToManyRelat return relation; } - public String getCreateImageId() { + @Override + public String getCreateImageId() { return JPAEditorImageProvider.ICON_MANY_TO_MANY_1_DIR; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateManyToOneBiDirRelationFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateManyToOneBiDirRelationFeature.java index e18cd35e64..dfcb7649e1 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateManyToOneBiDirRelationFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateManyToOneBiDirRelationFeature.java @@ -60,7 +60,8 @@ public class CreateManyToOneBiDirRelationFeature extends CreateManyToOneRelation return rel; } - public String getCreateImageId() { + @Override + public String getCreateImageId() { return JPAEditorImageProvider.ICON_MANY_TO_ONE_2_DIR; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateManyToOneUniDirRelationFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateManyToOneUniDirRelationFeature.java index 560e49cf19..b48404558d 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateManyToOneUniDirRelationFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateManyToOneUniDirRelationFeature.java @@ -52,7 +52,8 @@ public class CreateManyToOneUniDirRelationFeature extends CreateManyToOneRelatio return relation; } - public String getCreateImageId() { + @Override + public String getCreateImageId() { return JPAEditorImageProvider.ICON_MANY_TO_ONE_1_DIR; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateMappedSuperclassFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateMappedSuperclassFeature.java index 1e074821f8..f1a657f75b 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateMappedSuperclassFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateMappedSuperclassFeature.java @@ -105,11 +105,13 @@ public class CreateMappedSuperclassFeature extends return new Object[] {}; } + @Override public String getCreateImageId() { return JPAEditorImageProvider.ADD_MAPPED_SUPERCLASS; } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider) super.getFeatureProvider(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateOneToManyUniDirRelationFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateOneToManyUniDirRelationFeature.java index 322653c15b..f6810ea83c 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateOneToManyUniDirRelationFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateOneToManyUniDirRelationFeature.java @@ -49,7 +49,8 @@ public class CreateOneToManyUniDirRelationFeature extends CreateOneToManyRelatio return relation; } - public String getCreateImageId() { + @Override + public String getCreateImageId() { return JPAEditorImageProvider.ICON_ONE_TO_MANY_1_DIR; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateOneToOneBiDirRelationFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateOneToOneBiDirRelationFeature.java index 689fbf9c8a..98376cb9ff 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateOneToOneBiDirRelationFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateOneToOneBiDirRelationFeature.java @@ -60,7 +60,8 @@ public class CreateOneToOneBiDirRelationFeature extends CreateOneToOneRelationFe return rel; } - public String getCreateImageId() { + @Override + public String getCreateImageId() { return JPAEditorImageProvider.ICON_ONE_TO_ONE_2_DIR; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateOneToOneUniDirRelationFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateOneToOneUniDirRelationFeature.java index 6036ef3626..d38c03b3dd 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateOneToOneUniDirRelationFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateOneToOneUniDirRelationFeature.java @@ -54,7 +54,8 @@ public class CreateOneToOneUniDirRelationFeature extends CreateOneToOneRelationF return res; } - public String getCreateImageId() { + @Override + public String getCreateImageId() { return JPAEditorImageProvider.ICON_ONE_TO_ONE_1_DIR; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateRelationFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateRelationFeature.java index fd6aef9a64..33c637b503 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateRelationFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateRelationFeature.java @@ -138,6 +138,7 @@ abstract public class CreateRelationFeature extends AbstractCreateConnectionFeat abstract protected AbstractRelation createRelation(IJPAEditorFeatureProvider fp, PictogramElement source, PictogramElement target, JavaPersistentType type); + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider)super.getFeatureProvider(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DeleteJPAEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DeleteJPAEntityFeature.java index 0191f39bfa..5499d13fd3 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DeleteJPAEntityFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DeleteJPAEntityFeature.java @@ -43,7 +43,8 @@ public class DeleteJPAEntityFeature extends DefaultDeleteFeature { super(fp); } - public void delete(final IDeleteContext context) { + @Override + public void delete(final IDeleteContext context) { PictogramElement pe = context.getPictogramElement(); JavaPersistentType jpt = (JavaPersistentType)getFeatureProvider().getBusinessObjectForPictogramElement(pe); @@ -51,6 +52,7 @@ public class DeleteJPAEntityFeature extends DefaultDeleteFeature { entityName = JPAEditorUtil.returnSimpleName(JpaArtifactFactory.instance().getEntityName(jpt)); TransactionalEditingDomain ted = TransactionUtil.getEditingDomain(pe); ted.getCommandStack().execute(new RecordingCommand(ted) { + @Override protected void doExecute() { deleteEl(context); } @@ -62,7 +64,8 @@ public class DeleteJPAEntityFeature extends DefaultDeleteFeature { super.delete(context); } - protected void deleteBusinessObject(Object bo) { + @Override + protected void deleteBusinessObject(Object bo) { JavaPersistentType jpt = null; if (bo instanceof JavaPersistentType) { jpt = (JavaPersistentType) bo; @@ -81,10 +84,12 @@ public class DeleteJPAEntityFeature extends DefaultDeleteFeature { } } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider)super.getFeatureProvider(); } + @Override protected boolean getUserDecision(IDeleteContext context) { String msg = ""; //$NON-NLS-1$ IMultiDeleteInfo multiDeleteInfo = context.getMultiDeleteInfo(); diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DeleteRelationFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DeleteRelationFeature.java index 2b38643da2..18e3e03249 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DeleteRelationFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DeleteRelationFeature.java @@ -49,14 +49,17 @@ public class DeleteRelationFeature extends DefaultDeleteFeature{ ut = fp.getJPAEditorUtil(); } + @Override public boolean canDelete(IDeleteContext context) { return true; } + @Override public boolean isAvailable(IContext context) { return true; } + @Override public boolean canExecute(IContext context) { return true; } @@ -65,7 +68,8 @@ public class DeleteRelationFeature extends DefaultDeleteFeature{ return JPAEditorMessages.DeleteRelationFeature_deleteRelationQuestion; } - public void delete(IDeleteContext context) { + @Override + public void delete(IDeleteContext context) { PictogramElement pe = context.getPictogramElement(); Object businessObjectForPictogramElement = getBusinessObjectForPictogramElement(pe); if (businessObjectForPictogramElement != null) { @@ -144,6 +148,7 @@ public class DeleteRelationFeature extends DefaultDeleteFeature{ } } + @Override public void postDelete(IDeleteContext context) { PictogramElement pe = context.getPictogramElement(); Object businessObjectForPictogramElement = getBusinessObjectForPictogramElement(pe); @@ -168,10 +173,12 @@ public class DeleteRelationFeature extends DefaultDeleteFeature{ } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider)super.getFeatureProvider(); } + @Override protected boolean getUserDecision(IDeleteContext context) { return MessageDialog.openQuestion(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), JPAEditorMessages.DeleteFeature_deleteConfirm, JPAEditorMessages.DeleteRelationFeature_deleteRelationQuestion); diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DirectEditAttributeFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DirectEditAttributeFeature.java index e00a6a79e1..8b1bcbda66 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DirectEditAttributeFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DirectEditAttributeFeature.java @@ -86,7 +86,7 @@ public class DirectEditAttributeFeature extends AbstractDirectEditingFeature { private IStatus checkDuplicateAttribute(String value, IDirectEditingContext context) { PictogramElement pe = context.getPictogramElement(); JavaPersistentAttribute oldAt = (JavaPersistentAttribute) getBusinessObjectForPictogramElement(pe); - JavaPersistentAttribute newAl = (JavaPersistentAttribute)((JavaPersistentType)oldAt.getParent()).getAttributeNamed(value); + JavaPersistentAttribute newAl = ((JavaPersistentType)oldAt.getParent()).getAttributeNamed(value); if (newAl != null && !newAl.equals(oldAt)) { String message = MessageFormat.format(JPAEditorMessages.DirectEditAttributeFeature_attributeExists, value); return new Status(IStatus.ERROR, JPADiagramEditorPlugin.PLUGIN_ID, message); @@ -94,10 +94,12 @@ public class DirectEditAttributeFeature extends AbstractDirectEditingFeature { return Status.OK_STATUS; } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider) super.getFeatureProvider(); } + @Override public void setValue(String value, IDirectEditingContext context) { if (isMethodAnnotated) value = JPAEditorUtil.produceValidAttributeName(value); @@ -123,6 +125,7 @@ public class DirectEditAttributeFeature extends AbstractDirectEditingFeature { TransactionalEditingDomain ted = TransactionUtil.getEditingDomain(alg); ted.getCommandStack().execute(new RecordingCommand(ted) { + @Override protected void doExecute() { ((Text) alg).setValue(newValue); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DiscardAndRemoveAllEntitiesFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DiscardAndRemoveAllEntitiesFeature.java index 90b7b10085..eb4523b239 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DiscardAndRemoveAllEntitiesFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DiscardAndRemoveAllEntitiesFeature.java @@ -34,10 +34,12 @@ public class DiscardAndRemoveAllEntitiesFeature extends RemoveAllEntitiesFeature super(fp); } + @Override public String getConfirmationText() { return JPAEditorMessages.JPAEditorToolBehaviorProvider_removeAndDiscardAllEntitiesConfirmation; } + @Override public void execute(ICustomContext context) { MessageDialog dlg = new MessageDialog(Display.getCurrent().getShells()[0], JPAEditorMessages.JPAEditorToolBehaviorProvider_removeAllEntitiesMenu, diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/EmbedCollectionOfObjectsFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/EmbedCollectionOfObjectsFeature.java index cd293a767b..4b4eebc6a8 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/EmbedCollectionOfObjectsFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/EmbedCollectionOfObjectsFeature.java @@ -113,7 +113,8 @@ public class EmbedCollectionOfObjectsFeature extends AbstractCreateConnectionFea return true;
}
- public String getCreateImageId() {
+ @Override
+ public String getCreateImageId() {
return JPAEditorImageProvider.ICON_ELEMENT_COLLECTION;
}
@@ -179,6 +180,7 @@ public class EmbedCollectionOfObjectsFeature extends AbstractCreateConnectionFea return notAllowed;
}
+ @Override
public IJPAEditorFeatureProvider getFeatureProvider() {
return (IJPAEditorFeatureProvider)super.getFeatureProvider();
}
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/EmbedSingleObjectFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/EmbedSingleObjectFeature.java index b41f28ce6e..621c71fa23 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/EmbedSingleObjectFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/EmbedSingleObjectFeature.java @@ -104,7 +104,8 @@ public class EmbedSingleObjectFeature extends AbstractCreateConnectionFeature { return true;
}
- public String getCreateImageId() {
+ @Override
+ public String getCreateImageId() {
return JPAEditorImageProvider.ICON_EMBEDDED;
}
@@ -119,6 +120,7 @@ public class EmbedSingleObjectFeature extends AbstractCreateConnectionFeature { return null;
}
+ @Override
public IJPAEditorFeatureProvider getFeatureProvider() {
return (IJPAEditorFeatureProvider)super.getFeatureProvider();
}
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ExpandAllEntitiesFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ExpandAllEntitiesFeature.java index b801b68e6c..229465629e 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ExpandAllEntitiesFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ExpandAllEntitiesFeature.java @@ -47,6 +47,7 @@ public class ExpandAllEntitiesFeature extends AbstractCustomFeature{ TransactionalEditingDomain ted = TransactionUtil.getEditingDomain(diagram); ted.getCommandStack().execute(new RecordingCommand(ted) { + @Override protected void doExecute() { EList<Shape> shapes = diagram.getChildren(); for (PictogramElement el : shapes) { @@ -77,6 +78,7 @@ public class ExpandAllEntitiesFeature extends AbstractCustomFeature{ return true; } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider)super.getFeatureProvider(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ExpandCompartmentShapeFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ExpandCompartmentShapeFeature.java index e27e43029a..b0876e9799 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ExpandCompartmentShapeFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ExpandCompartmentShapeFeature.java @@ -53,6 +53,7 @@ public class ExpandCompartmentShapeFeature extends AbstractCustomFeature{ final ContainerShape entityShape = containerShape.getContainer(); TransactionalEditingDomain ted = TransactionUtil.getEditingDomain(algo); ted.getCommandStack().execute(new RecordingCommand(ted) { + @Override protected void doExecute() { algo.setHeight(pictHeight); int height = GraphicsUpdater.getPrimaryShape(entityShape).getGraphicsAlgorithm().getHeight() + @@ -106,6 +107,7 @@ public class ExpandCompartmentShapeFeature extends AbstractCustomFeature{ return ret; } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider)super.getFeatureProvider(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ExpandEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ExpandEntityFeature.java index 8c52d27ee6..eb359895c9 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ExpandEntityFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ExpandEntityFeature.java @@ -49,6 +49,7 @@ public class ExpandEntityFeature extends AbstractCustomFeature{ TransactionalEditingDomain ted = TransactionUtil.getEditingDomain(containerShape); ted.getCommandStack().execute(new RecordingCommand(ted) { + @Override protected void doExecute() { GraphicsUpdater.updateEntityShape(containerShape); @@ -95,6 +96,7 @@ public class ExpandEntityFeature extends AbstractCustomFeature{ return ret; } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider)super.getFeatureProvider(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/GraphicalAddAttributeFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/GraphicalAddAttributeFeature.java index 755d3e88ff..0889fd5f9b 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/GraphicalAddAttributeFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/GraphicalAddAttributeFeature.java @@ -52,6 +52,7 @@ public class GraphicalAddAttributeFeature extends AbstractAddShapeFeature { final Wrp wrp = new Wrp(); TransactionalEditingDomain ted = TransactionUtil.getEditingDomain(entityShape); ted.getCommandStack().execute(new RecordingCommand(ted) { + @Override protected void doExecute() { JavaPersistentAttribute newAttr = (JavaPersistentAttribute) context.getNewObject(); String txt = JPAEditorUtil.getText(newAttr); @@ -133,6 +134,7 @@ public class GraphicalAddAttributeFeature extends AbstractAddShapeFeature { return textShape; } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider) super.getFeatureProvider(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/LayoutJPAEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/LayoutJPAEntityFeature.java index a45e2d7363..87fb5b1a60 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/LayoutJPAEntityFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/LayoutJPAEntityFeature.java @@ -87,6 +87,7 @@ public class LayoutJPAEntityFeature extends AbstractLayoutFeature { return anythingChanged; } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider)super.getFeatureProvider(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/MoveAttributeFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/MoveAttributeFeature.java index fd9e639f1a..537e39ec38 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/MoveAttributeFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/MoveAttributeFeature.java @@ -33,17 +33,20 @@ public class MoveAttributeFeature extends DefaultMoveShapeFeature { super(fp); } - public boolean canMoveShape(IMoveShapeContext context) { + @Override + public boolean canMoveShape(IMoveShapeContext context) { return false; } - public boolean canExecute(IContext context) { + @Override + public boolean canExecute(IContext context) { return false; } - public boolean isAvailable(IContext context) { + @Override + public boolean isAvailable(IContext context) { return false; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/MoveEntityShapeFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/MoveEntityShapeFeature.java index 80d259355f..6fc73acaf2 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/MoveEntityShapeFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/MoveEntityShapeFeature.java @@ -36,9 +36,11 @@ public class MoveEntityShapeFeature extends DefaultMoveShapeFeature { super(fp); } + @Override protected void moveAllBendpoints(IMoveShapeContext context) { } + @Override protected void postMoveShape(IMoveShapeContext context) { ContainerShape cs = (ContainerShape)context.getShape(); JPAEditorUtil.rearrangeAllConnections(cs, getFeatureProvider(), false); @@ -55,7 +57,8 @@ public class MoveEntityShapeFeature extends DefaultMoveShapeFeature { PictogramElement el = context.getPictogramElement(); TransactionalEditingDomain ted = TransactionUtil.getEditingDomain(el); ted.getCommandStack().execute(new RecordingCommand(ted) { - protected void doExecute() { + @Override + protected void doExecute() { move(context); } }); @@ -65,6 +68,7 @@ public class MoveEntityShapeFeature extends DefaultMoveShapeFeature { super.internalMove(context); } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider)super.getFeatureProvider(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/OpenJPADetailsViewFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/OpenJPADetailsViewFeature.java index e6f881c9c6..4aaa4c8ec8 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/OpenJPADetailsViewFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/OpenJPADetailsViewFeature.java @@ -31,6 +31,7 @@ public class OpenJPADetailsViewFeature extends AbstractCustomFeature { super(fp); } + @Override public boolean canExecute(ICustomContext context) { return true; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/OpenMiniatureViewFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/OpenMiniatureViewFeature.java index bcd7856b51..e52ec1d69d 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/OpenMiniatureViewFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/OpenMiniatureViewFeature.java @@ -31,6 +31,7 @@ public class OpenMiniatureViewFeature extends AbstractCustomFeature { super(fp); } + @Override public boolean canExecute(ICustomContext context) { return true; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RefactorEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RefactorEntityFeature.java index cda63d292e..40a65fbc7a 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RefactorEntityFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RefactorEntityFeature.java @@ -199,7 +199,7 @@ public abstract class RefactorEntityFeature extends AbstractCustomFeature { cont.setWidth(width); cont.setHeight(height); RoundedRectangle rect = AddJPAEntityFeature.createEntityRectangle(cont, cs, dot, fp.getDiagramTypeProvider().getDiagram()); - rect.setFilled(true); + rect.setFilled(Boolean.TRUE); IRemoveContext ctx = new RemoveContext(pict); RemoveJPAEntityFeature ft = new RemoveJPAEntityFeature(fp, true); @@ -357,6 +357,6 @@ public abstract class RefactorEntityFeature extends AbstractCustomFeature { return newJptName; } - }; + } } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveAllEntitiesFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveAllEntitiesFeature.java index 4b5f6ce3a8..1d706635cd 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveAllEntitiesFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveAllEntitiesFeature.java @@ -40,6 +40,7 @@ public abstract class RemoveAllEntitiesFeature extends AbstractCustomFeature { public abstract String getConfirmationText(); + @Override public boolean canExecute(ICustomContext context) { return true; } @@ -60,6 +61,7 @@ public abstract class RemoveAllEntitiesFeature extends AbstractCustomFeature { } } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider) super.getFeatureProvider(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveAndSaveEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveAndSaveEntityFeature.java index 72789423f0..155e18bc38 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveAndSaveEntityFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveAndSaveEntityFeature.java @@ -44,7 +44,8 @@ public class RemoveAndSaveEntityFeature extends DefaultRemoveFeature { super(fp); } - public void preRemove(IRemoveContext context) { + @Override + public void preRemove(IRemoveContext context) { PictogramElement pe = context.getPictogramElement(); Object bo = getFeatureProvider().getBusinessObjectForPictogramElement(pe); Set<Shape> shapesForDeletion = new HashSet<Shape>(); @@ -68,13 +69,15 @@ public class RemoveAndSaveEntityFeature extends DefaultRemoveFeature { } } - public void execute(IContext context) { + @Override + public void execute(IContext context) { if (!IRemoveContext.class.isInstance(context)) return; final IRemoveContext removeContext = (IRemoveContext)context; PictogramElement pe = removeContext.getPictogramElement(); TransactionalEditingDomain ted = TransactionUtil.getEditingDomain(pe); ted.getCommandStack().execute(new RecordingCommand(ted) { + @Override protected void doExecute() { removeEntityFromDiagram(removeContext); } @@ -85,11 +88,13 @@ public class RemoveAndSaveEntityFeature extends DefaultRemoveFeature { super.remove(context); } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider)super.getFeatureProvider(); } - public void postRemove(IRemoveContext context) { + @Override + public void postRemove(IRemoveContext context) { JpaArtifactFactory.instance().rearrangeIsARelations(getFeatureProvider()); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveAttributeFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveAttributeFeature.java index 21a9ad6801..64fa4c6df6 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveAttributeFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveAttributeFeature.java @@ -62,18 +62,22 @@ public class RemoveAttributeFeature extends DefaultRemoveFeature { public void setKey(String key) { } + @Override public boolean isAvailable(IContext context) { return false; } + @Override public boolean canExecute(IContext context) { return false; } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider) super.getFeatureProvider(); } + @Override public void preRemove(IRemoveContext context) { final PictogramElement pe = context.getPictogramElement(); if (pe == null) { @@ -137,6 +141,7 @@ public class RemoveAttributeFeature extends DefaultRemoveFeature { ft.remove(ctx); } + @Override public void postRemove(IRemoveContext context) { if (skipCreateRelations) return; diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveJPAEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveJPAEntityFeature.java index 9f323d8ab2..fdcd421ba3 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveJPAEntityFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveJPAEntityFeature.java @@ -53,7 +53,8 @@ public class RemoveJPAEntityFeature extends DefaultRemoveFeature { this.shouldRearrangeIsARelations = shouldRearrangeIsARelations; } - public void preRemove(IRemoveContext context) { + @Override + public void preRemove(IRemoveContext context) { PictogramElement pe = context.getPictogramElement(); final Object bo = getFeatureProvider().getBusinessObjectForPictogramElement(pe); Set<Shape> shapesForDeletion = new HashSet<Shape>(); @@ -80,11 +81,13 @@ public class RemoveJPAEntityFeature extends DefaultRemoveFeature { } } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider)super.getFeatureProvider(); } + @Override public void execute(IContext ctx) { if (!IRemoveContext.class.isInstance(ctx)) return; @@ -100,6 +103,7 @@ public class RemoveJPAEntityFeature extends DefaultRemoveFeature { MessageDialog dialog = new MessageDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), JPAEditorMessages.JPASolver_closeEditors, null, message, MessageDialog.WARNING, new String[]{JPAEditorMessages.BTN_OK, JPAEditorMessages.BTN_CANCEL}, 0) { + @Override protected int getShellStyle() { return SWT.CLOSE | SWT.TITLE | SWT.BORDER @@ -107,9 +111,10 @@ public class RemoveJPAEntityFeature extends DefaultRemoveFeature { | getDefaultOrientation();}}; if (dialog.open() != 0) return; - } + } TransactionalEditingDomain ted = TransactionUtil.getEditingDomain(pe); ted.getCommandStack().execute(new RecordingCommand(ted) { + @Override protected void doExecute() { removeEntityFromDiagram(context); } @@ -121,7 +126,8 @@ public class RemoveJPAEntityFeature extends DefaultRemoveFeature { super.execute(context); } - public void postRemove(IRemoveContext context) { + @Override + public void postRemove(IRemoveContext context) { if (shouldRearrangeIsARelations) JpaArtifactFactory.instance().rearrangeIsARelations(getFeatureProvider()); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveRelationFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveRelationFeature.java index 5845aaa968..cff980e94e 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveRelationFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveRelationFeature.java @@ -49,7 +49,8 @@ public class RemoveRelationFeature extends AbstractFeature implements IRemoveFea super(fp); } - public boolean isAvailable(IContext context) { + @Override + public boolean isAvailable(IContext context) { return true; } @@ -86,6 +87,7 @@ public class RemoveRelationFeature extends AbstractFeature implements IRemoveFea return; TransactionalEditingDomain ted = TransactionUtil.getEditingDomain(pe); RecordingCommand rc = new RecordingCommand(ted) { + @Override protected void doExecute() { if (pe instanceof Shape) { Shape shape = (Shape) pe; @@ -130,6 +132,7 @@ public class RemoveRelationFeature extends AbstractFeature implements IRemoveFea } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider)super.getFeatureProvider(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ResizeAttributeFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ResizeAttributeFeature.java index 22308ab9f5..c35d2a5a67 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ResizeAttributeFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ResizeAttributeFeature.java @@ -27,17 +27,20 @@ public class ResizeAttributeFeature extends DefaultResizeShapeFeature { super(fp); } - public boolean canResizeShape(IResizeShapeContext context) { + @Override + public boolean canResizeShape(IResizeShapeContext context) { return false; } - public boolean canExecute(IContext context) { + @Override + public boolean canExecute(IContext context) { return false; } - public boolean isAvailable(IContext context) { + @Override + public boolean isAvailable(IContext context) { return false; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ResizeJPAEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ResizeJPAEntityFeature.java index cbf59b93d2..3e7b79ee43 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ResizeJPAEntityFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ResizeJPAEntityFeature.java @@ -56,10 +56,12 @@ public class ResizeJPAEntityFeature extends DefaultResizeShapeFeature { super.resizeShape(context); } + @Override public void resizeShape(final IResizeShapeContext context) { final ContainerShape entityShape = (ContainerShape) context.getShape(); TransactionalEditingDomain ted = TransactionUtil.getEditingDomain(entityShape); ted.getCommandStack().execute(new RecordingCommand(ted) { + @Override protected void doExecute() { resizeContainerShape(context); JPAEditorUtil.rearrangeAllConnections(entityShape, @@ -68,6 +70,7 @@ public class ResizeJPAEntityFeature extends DefaultResizeShapeFeature { }); } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider)super.getFeatureProvider(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RestoreEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RestoreEntityFeature.java index 60b67473b9..f1f0da4e2e 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RestoreEntityFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RestoreEntityFeature.java @@ -35,6 +35,7 @@ public class RestoreEntityFeature extends AbstractCustomFeature { super(fp); } + @Override public boolean canExecute(ICustomContext context) { return true; } @@ -52,6 +53,7 @@ public class RestoreEntityFeature extends AbstractCustomFeature { JPAEditorMessages.JPASolver_closeEditors, null, message, MessageDialog.WARNING, new String[] { JPAEditorMessages.BTN_OK }, 0) { + @Override protected int getShellStyle() { return SWT.CLOSE | SWT.TITLE | SWT.BORDER | SWT.APPLICATION_MODAL | getDefaultOrientation(); @@ -63,6 +65,7 @@ public class RestoreEntityFeature extends AbstractCustomFeature { JpaArtifactFactory.instance().restoreEntityClass(jpt, getFeatureProvider()); } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider)super.getFeatureProvider(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/SaveAndRemoveAllEntitiesFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/SaveAndRemoveAllEntitiesFeature.java index 9665d519e5..bb08373e10 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/SaveAndRemoveAllEntitiesFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/SaveAndRemoveAllEntitiesFeature.java @@ -22,8 +22,8 @@ import org.eclipse.graphiti.features.context.ICustomContext; import org.eclipse.graphiti.features.context.impl.CustomContext; import org.eclipse.graphiti.mm.pictograms.PictogramElement; import org.eclipse.graphiti.mm.pictograms.Shape; -import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.window.Window; import org.eclipse.jpt.jpadiagrameditor.ui.internal.i18n.JPAEditorMessages; import org.eclipse.swt.widgets.Display; @@ -34,17 +34,19 @@ public class SaveAndRemoveAllEntitiesFeature extends RemoveAllEntitiesFeature { super(fp); } + @Override public String getConfirmationText() { return JPAEditorMessages.JPAEditorToolBehaviorProvider_removeAndSaveAllEntitiesConfirmation; } + @Override public void execute(ICustomContext context) { MessageDialog dlg = new MessageDialog(Display.getCurrent().getShells()[0], JPAEditorMessages.JPAEditorToolBehaviorProvider_removeAllEntitiesMenu, null, getConfirmationText(), 0, - new String[] {JPAEditorMessages.BTN_OK, JPAEditorMessages.BTN_CANCEL}, Dialog.CANCEL); - if (dlg.open() != Dialog.OK) + new String[] {JPAEditorMessages.BTN_OK, JPAEditorMessages.BTN_CANCEL}, Window.CANCEL); + if (dlg.open() != Window.OK) return; Iterator<Shape> it = this.getDiagram().getChildren().iterator(); while (it.hasNext()) { diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/SaveEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/SaveEntityFeature.java index 0189647cbf..ec95e989e0 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/SaveEntityFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/SaveEntityFeature.java @@ -30,6 +30,7 @@ public class SaveEntityFeature extends AbstractCustomFeature { super(fp); } + @Override public boolean canExecute(ICustomContext context) { return true; } @@ -39,6 +40,7 @@ public class SaveEntityFeature extends AbstractCustomFeature { JpaArtifactFactory.instance().forceSaveEntityClass(jpt, getFeatureProvider()); } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider)super.getFeatureProvider(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/UpdateAttributeFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/UpdateAttributeFeature.java index da91a89783..583045686f 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/UpdateAttributeFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/UpdateAttributeFeature.java @@ -48,11 +48,13 @@ public class UpdateAttributeFeature extends AbstractCustomFeature { /** * @deprecated use the {@link GraphicalRemoveAttributeFeature} */ + @Deprecated public void execute(ICustomContext context) { GraphicalRemoveAttributeFeature remove = new GraphicalRemoveAttributeFeature(getFeatureProvider()); remove.execute(context); } + @Override public IJPAEditorFeatureProvider getFeatureProvider() { return (IJPAEditorFeatureProvider) super.getFeatureProvider(); } @@ -70,8 +72,8 @@ public class UpdateAttributeFeature extends AbstractCustomFeature { public static Rectangle addRectangleForText(ContainerShape cs, int attribIndex, int width) { Rectangle rect = Graphiti.getGaService().createRectangle(cs); - rect.setFilled(false); - rect.setLineVisible(false); + rect.setFilled(Boolean.FALSE); + rect.setLineVisible(Boolean.FALSE); rect.setHeight(JPAEditorConstants.ATTRIBUTE_RECT_HEIGHT); rect.setWidth(width - JPAEditorConstants.ATTRIBUTE_TEXT_RECT_WIDTH_REDUCER); rect.setX(JPAEditorConstants.ATTRIBUTE_TEXT_RECT_X); @@ -83,8 +85,8 @@ public class UpdateAttributeFeature extends AbstractCustomFeature { public static Rectangle addRectangleForIcon(ContainerShape cs, int attribIndex) { Rectangle rect = Graphiti.getGaService().createRectangle(cs); - rect.setFilled(false); - rect.setLineVisible(false); + rect.setFilled(Boolean.FALSE); + rect.setLineVisible(Boolean.FALSE); rect.setHeight(JPAEditorConstants.ICON_RECT_HEIGHT); rect.setX(JPAEditorConstants.ICON_RECT_LEFT_OFFSET); rect.setWidth(JPAEditorConstants.ICON_RECT_WIDTH); @@ -109,7 +111,7 @@ public class UpdateAttributeFeature extends AbstractCustomFeature { IColorConstant background = JpaArtifactFactory.instance().getBackground(dot); rectangle.setForeground(manageColor(background)); rectangle.setBackground(manageColor(foreground)); - rectangle.setLineVisible(false); + rectangle.setLineVisible(Boolean.FALSE); Graphiti.getGaService().setSize(rectangle, width, JPAEditorConstants.SEPARATOR_HEIGHT); Graphiti.getGaService().setLocationAndSize(rectangle, 0, y, width, JPAEditorConstants.SEPARATOR_HEIGHT); return shape; diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/ui/JPADiagramEditorInput.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/ui/JPADiagramEditorInput.java index 3631eb4b71..871237c85b 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/ui/JPADiagramEditorInput.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/ui/JPADiagramEditorInput.java @@ -48,6 +48,7 @@ public class JPADiagramEditorInput extends DiagramEditorInput this.projectName = ModelIntegrationUtil.getProjectByDiagram(diagram.getName()).getName(); } + @Override @SuppressWarnings("rawtypes") public Object getAdapter(Class adapter) { if (adapter.equals(EObject.class)) { diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/ui/OpenJpaDiagramActionDelegate.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/ui/OpenJpaDiagramActionDelegate.java index 1835a0ff65..774d8b9fac 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/ui/OpenJpaDiagramActionDelegate.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/ui/OpenJpaDiagramActionDelegate.java @@ -162,6 +162,7 @@ public class OpenJpaDiagramActionDelegate implements IObjectActionDelegate { final CreateDiagramJob createDiagramRunnable = new CreateDiagramJob(persistenceUnit, 10, true); createDiagramRunnable.setRule(ResourcesPlugin.getWorkspace().getRoot()); createDiagramRunnable.addJobChangeListener(new JobChangeAdapter(){ + @Override public void done(IJobChangeEvent event) { shell.getDisplay().syncExec(new OpenEditorRunnable(createDiagramRunnable.getDiagram())); } @@ -201,7 +202,7 @@ public class OpenJpaDiagramActionDelegate implements IObjectActionDelegate { private void handleException(Exception e) { - JPADiagramEditorPlugin.logError(ERROR_OPENING_DIAGRAM, e);; + JPADiagramEditorPlugin.logError(ERROR_OPENING_DIAGRAM, e); IStatus status = new ErrStatus(IStatus.ERROR, JPADiagramEditor.ID, e.toString(), e); ErrorDialog.openError(shell, JPAEditorMessages.OpenJpaDiagramActionDelegate_openJPADiagramErrorMsgTitle, ERROR_OPENING_DIAGRAM, status); @@ -213,6 +214,7 @@ public class OpenJpaDiagramActionDelegate implements IObjectActionDelegate { super(severity, message, message, exception); } + @Override public IStatus[] getChildren() { StackTraceElement[] st = getException().getStackTrace(); IStatus[] res = new IStatus[st == null ? 0 : st.length]; diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/util/CreateDiagramJob.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/util/CreateDiagramJob.java index 0bf985e070..a4eb2e5930 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/util/CreateDiagramJob.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/util/CreateDiagramJob.java @@ -45,6 +45,7 @@ public class CreateDiagramJob extends Job { this.snap = snap; } + @Override public IStatus run(IProgressMonitor monitor) { try{ monitor.beginTask(JPAEditorMessages.CreateDiagramJob_getJPADiagramMonitorTaskName, 3); diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/util/ModelIntegrationUtil.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/util/ModelIntegrationUtil.java index bb49a5084d..1c53b22e27 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/util/ModelIntegrationUtil.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/util/ModelIntegrationUtil.java @@ -117,7 +117,7 @@ public class ModelIntegrationUtil { for(IResource res : resources){ if(res instanceof IFolder) { folderPath = ((IFolder)res).getFullPath(); - IFile existingXMIFile =((IFolder)res).getFile(xmiFileName); //$NON-NLS-1$ + IFile existingXMIFile =((IFolder)res).getFile(xmiFileName); if(existingXMIFile != null && existingXMIFile.exists()){ IFileStore folder = EFS.getLocalFileSystem().getStore(existingXMIFile.getLocationURI()); folder.copy(newXMIFile, EFS.OVERWRITE, null); @@ -260,7 +260,7 @@ public class ModelIntegrationUtil { IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(diagramName); Iterator<JpaProject> iter = getJpaProjectManager().getJpaProjects().iterator(); while (iter.hasNext()) { - JpaProject jpaProject = (JpaProject) iter.next(); + JpaProject jpaProject = iter.next(); if(jpaProject.getName().equalsIgnoreCase(diagramName)){ return jpaProject; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/preferences/JPAEditorPreferencesPage.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/preferences/JPAEditorPreferencesPage.java index 328174c956..0677ba4f83 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/preferences/JPAEditorPreferencesPage.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/preferences/JPAEditorPreferencesPage.java @@ -118,6 +118,7 @@ public class JPAEditorPreferencesPage extends FieldEditorPreferencePage fDefaultDiagramFolderField = new CustomStringFieldEditor( JPAEditorPreferenceInitializer.PROPERTY_DIAGRAM_FOLDER, JPAEditorMessages.JPAEditorPreferencesPage_defaultFolderControlLabel, getFieldEditorParent()) { + @Override protected IStatus validateValue() { return validateDefaultFolder(IPath.SEPARATOR + FICTIVE_PROJECT_NAME + IPath.SEPARATOR + fDefaultDiagramFolderField.getStringValue().trim(), FICTIVE_PROJECT_NAME); @@ -138,6 +139,7 @@ public class JPAEditorPreferencesPage extends FieldEditorPreferencePage fDefaultEntityPackageField = new CustomStringFieldEditor( JPAEditorPreferenceInitializer.PROPERTY_ENTITY_PACKAGE, JPAEditorMessages.JPAEditorPreferencesPage_DefaultPackageToUse, getFieldEditorParent()) { + @Override protected IStatus validateValue() { return validateDefaultPackage(fDefaultEntityPackageField.getStringValue().trim()); } @@ -160,6 +162,7 @@ public class JPAEditorPreferencesPage extends FieldEditorPreferencePage fDefaultTableNamePrefix = new CustomStringFieldEditor( JPAEditorPreferenceInitializer.PROPERTY_TABLE_NAME_PREFIX, JPAEditorMessages.JPAEditorPreferencesPage_DefaultTableNameLabel, getFieldEditorParent()) { + @Override protected IStatus validateValue() { return validateTableNamePrefix(fDefaultTableNamePrefix.getStringValue().trim()); } @@ -239,6 +242,7 @@ public class JPAEditorPreferencesPage extends FieldEditorPreferencePage String msg; String prefixMsg; + @Override protected boolean checkState() { IStatus stat = validateValue(); if (stat.getSeverity() == IStatus.ERROR) { @@ -250,6 +254,7 @@ public class JPAEditorPreferencesPage extends FieldEditorPreferencePage return true; } + @Override protected boolean doCheckState() { return true; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/propertypage/JPADiagramPropertyPage.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/propertypage/JPADiagramPropertyPage.java index 5451faa2ae..534b317a04 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/propertypage/JPADiagramPropertyPage.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/propertypage/JPADiagramPropertyPage.java @@ -58,7 +58,7 @@ public class JPADiagramPropertyPage extends PropertyPage { public static final String PROJECT_SETTINGS_PATH = "/.settings/org.eclipse.jpt.jpadiagrameditor.ui"; //$NON-NLS-1$; protected IProject project = null; - protected boolean isJPA10Project = false; //$NON-NLS-1$; + protected boolean isJPA10Project = false; private Properties editorProps; diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorContextMenuProvider.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorContextMenuProvider.java index e04e47852f..16bd35fac6 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorContextMenuProvider.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorContextMenuProvider.java @@ -33,6 +33,7 @@ public class JPAEditorContextMenuProvider extends DiagramEditorContextMenuProvid protected void addDefaultMenuGroupEdit(IMenuManager manager, Point menuLocation) { } + @Override protected void addActionToMenuIfAvailable(IMenuManager manager, String actionId, String menuGroup) { if (actionId.equals("predefined remove action") || //$NON-NLS-1$ actionId.equals("predefined update action")) //$NON-NLS-1$ diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorDiagramTypeProvider.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorDiagramTypeProvider.java index e678c32c19..6c992899ab 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorDiagramTypeProvider.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorDiagramTypeProvider.java @@ -45,6 +45,7 @@ import org.eclipse.graphiti.platform.IDiagramEditor; import org.eclipse.graphiti.services.Graphiti; import org.eclipse.graphiti.tb.IToolBehaviorProvider; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.window.Window; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; @@ -189,28 +190,26 @@ public class JPAEditorDiagramTypeProvider extends AbstractDiagramTypeProvider { if (dialog.open() == 1) { closeEditor(); return true; - } else { - IStatus stat = ResourcesPlugin.getWorkspace().validateEdit(new IFile[]{f}, null); - if (!stat.isOK()) { - message = NLS.bind(JPAEditorMessages.JPAEditorDiagramTypeProvider_cantMakeDiagramWritableMsg, - stat.getMessage());; - dialog = new MessageDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), - JPAEditorMessages.JPAEditorDiagramTypeProvider_cantMakeDiagramWritableTitle, null, message, - MessageDialog.CANCEL, new String[] {JPAEditorMessages.BTN_OK}, 0) { - @Override - protected int getShellStyle() { - return SWT.CLOSE | SWT.TITLE | SWT.BORDER - | SWT.APPLICATION_MODAL - | getDefaultOrientation(); - } - }; - dialog.open(); - closeEditor(); - return true; - } else { - readOnly = false; - } } + IStatus stat = ResourcesPlugin.getWorkspace().validateEdit(new IFile[]{f}, null); + if (!stat.isOK()) { + message = NLS.bind(JPAEditorMessages.JPAEditorDiagramTypeProvider_cantMakeDiagramWritableMsg, + stat.getMessage()); + dialog = new MessageDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), + JPAEditorMessages.JPAEditorDiagramTypeProvider_cantMakeDiagramWritableTitle, null, message, + Window.CANCEL, new String[] {JPAEditorMessages.BTN_OK}, 0) { + @Override + protected int getShellStyle() { + return SWT.CLOSE | SWT.TITLE | SWT.BORDER + | SWT.APPLICATION_MODAL + | getDefaultOrientation(); + } + }; + dialog.open(); + closeEditor(); + return true; + } + readOnly = false; } else { return readOnly; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorFeatureProvider.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorFeatureProvider.java index 544c155f5c..ba097b2d6a 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorFeatureProvider.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorFeatureProvider.java @@ -65,6 +65,7 @@ import org.eclipse.graphiti.services.Graphiti; import org.eclipse.graphiti.services.IPeService; import org.eclipse.graphiti.ui.features.DefaultFeatureProvider; import org.eclipse.graphiti.util.IColorConstant; +import org.eclipse.graphiti.util.IPredefinedRenderingStyle; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.internal.core.CompilationUnit; import org.eclipse.jdt.internal.core.SourceType; @@ -127,7 +128,6 @@ import org.eclipse.jpt.jpadiagrameditor.ui.internal.relations.IRelation.RelType; import org.eclipse.jpt.jpadiagrameditor.ui.internal.relations.IsARelation; import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.GraphicsUpdaterImpl; import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.IGraphicsUpdater; -import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.IJPAEditorPredefinedRenderingStyle; import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.IJPAEditorUtil; import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.IJpaSolver; import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.IPeServiceUtil; @@ -216,7 +216,7 @@ public class JPAEditorFeatureProvider extends DefaultFeatureProvider implements redundantConnections.add(conn); continue; } - if (rel != null && !rel.getSuperclass().getName().equals(getFirstSuperclassBelongingToTheDiagram(rel.getSubclass()).getName())) { + if (!rel.getSuperclass().getName().equals(getFirstSuperclassBelongingToTheDiagram(rel.getSubclass()).getName())) { redundantConnections.add(conn); } } @@ -238,7 +238,7 @@ public class JPAEditorFeatureProvider extends DefaultFeatureProvider implements } catch (NullPointerException e) { return true; } - if (rel != null && !rel.getSuperclass().equals(getFirstSuperclassBelongingToTheDiagram(rel.getSubclass()))) { + if (!rel.getSuperclass().equals(getFirstSuperclassBelongingToTheDiagram(rel.getSubclass()))) { return true; } } @@ -300,9 +300,8 @@ public class JPAEditorFeatureProvider extends DefaultFeatureProvider implements } else if (newObj instanceof PersistentAttribute) { if (Diagram.class.isInstance(context.getTargetContainer())) { return null; - } else { - return new AddAttributeFeature(this); } + return new AddAttributeFeature(this); } else if (newObj instanceof CompilationUnit) { CompilationUnit cu = (CompilationUnit)newObj; JavaPersistentType jpt = JPAEditorUtil.getJPType(cu); @@ -605,6 +604,7 @@ public class JPAEditorFeatureProvider extends DefaultFeatureProvider implements } TransactionalEditingDomain ted = TransactionUtil.getEditingDomain(pe); ted.getCommandStack().execute(new RecordingCommand(ted) { + @Override protected void doExecute() { JPASolver solver = (JPASolver)getIndependenceSolver(); solver.remove(solver.getKeyForBusinessObject(oldAt)); @@ -694,6 +694,7 @@ public class JPAEditorFeatureProvider extends DefaultFeatureProvider implements } */ + @Override public void dispose() { stopThread(); ((JPASolver)getIndependenceSolver()).dispose(); @@ -725,6 +726,7 @@ public class JPAEditorFeatureProvider extends DefaultFeatureProvider implements return TransactionUtil.getEditingDomain(diagram); } + @Override public PictogramElement getPictogramElementForBusinessObject(Object businessObject) { PictogramElement pe = super.getPictogramElementForBusinessObject(businessObject); /* @@ -766,7 +768,7 @@ public class JPAEditorFeatureProvider extends DefaultFeatureProvider implements @Override protected void doExecute() { Graphiti.getGaService().setRenderingStyle(pe.getGraphicsAlgorithm(), - JPAEditorPredefinedColoredAreas.getAdaptedGradientColoredAreas(IJPAEditorPredefinedRenderingStyle.SILVER_WHITE_GLOSS_ID)); + JPAEditorPredefinedColoredAreas.getAdaptedGradientColoredAreas(IPredefinedRenderingStyle.SILVER_WHITE_GLOSS_ID)); pe.getGraphicsAlgorithm().setForeground(Graphiti.getGaService().manageColor(getDiagram(),JPAEditorConstants.ENTITY_DISABLED_COLOR)); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorImageCreator.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorImageCreator.java index 403ca00799..a187173aa7 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorImageCreator.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorImageCreator.java @@ -70,7 +70,7 @@ public class JPAEditorImageCreator implements IJPAEditorImageCreator { Polygon arrow = Graphiti.getGaService().createPolygon(cd, new int[] { 11, 3, 0, 0, 11, -3, 11, 3 }); arrow.setForeground(Graphiti.getGaService().manageColor(connection.getParent(), JPAEditorConstants.CONNECTION_LINE_COLOR)); arrow.setLineWidth(JPAEditorConstants.CONNECTION_LINE_WIDTH); - arrow.setFilled(true); + arrow.setFilled(Boolean.TRUE); return cd; } @@ -80,7 +80,7 @@ public class JPAEditorImageCreator implements IJPAEditorImageCreator { arrow.setForeground(Graphiti.getGaService().manageColor(connection.getParent(), JPAEditorConstants.IS_A_CONNECTION_LINE_COLOR)); arrow.setBackground(Graphiti.getGaService().manageColor(connection.getParent(), JPAEditorConstants.IS_A_ARROW_COLOR)); arrow.setLineWidth(JPAEditorConstants.CONNECTION_LINE_WIDTH); - arrow.setFilled(true); + arrow.setFilled(Boolean.TRUE); return cd; } @@ -90,7 +90,7 @@ public class JPAEditorImageCreator implements IJPAEditorImageCreator { arrow.setForeground(Graphiti.getGaService().manageColor(connection.getParent(), JPAEditorConstants.EMBEDDED_CONNECTION_LINE_COLOR)); arrow.setBackground(Graphiti.getGaService().manageColor(connection.getParent(), JPAEditorConstants.EMBEDDED_CONNECTION_LINE_COLOR)); arrow.setLineWidth(JPAEditorConstants.CONNECTION_LINE_WIDTH); - arrow.setFilled(true); + arrow.setFilled(Boolean.TRUE); return cd; } @@ -101,7 +101,7 @@ public class JPAEditorImageCreator implements IJPAEditorImageCreator { arrow.setForeground(Graphiti.getGaService().manageColor(connection.getParent(), JPAEditorConstants.CONNECTION_LINE_COLOR)); arrow.setBackground(Graphiti.getGaService().manageColor(connection.getParent(), JPAEditorConstants.CONNECTION_LINE_COLOR)); arrow.setLineWidth(JPAEditorConstants.CONNECTION_LINE_WIDTH); - arrow.setFilled(true); + arrow.setFilled(Boolean.TRUE); return cd; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorToolBehaviorProvider.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorToolBehaviorProvider.java index 543b50c18a..4511839cea 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorToolBehaviorProvider.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorToolBehaviorProvider.java @@ -293,7 +293,7 @@ public class JPAEditorToolBehaviorProvider extends DefaultToolBehaviorProvider { List<IPaletteCompartmentEntry> ret, IPaletteCompartmentEntry[] superCompartments) { PaletteCompartmentEntry ent = new PaletteCompartmentEntry(JPAEditorMessages.JPAEditorToolBehaviorProvider_InheritanceCompartmentTitle, superCompartments[1].getIconId()); - CreateInheritedEntityFeature ft = new CreateInheritedEntityFeature((IJPAEditorFeatureProvider) this.getFeatureProvider()); + CreateInheritedEntityFeature ft = new CreateInheritedEntityFeature(this.getFeatureProvider()); ConnectionCreationToolEntry isARelToolEntry = new ConnectionCreationToolEntry(ft.getCreateName(), ft.getCreateDescription(), ft.getCreateImageId(), ft.getCreateLargeImageId()); isARelToolEntry.addCreateConnectionFeature(ft); @@ -301,7 +301,7 @@ public class JPAEditorToolBehaviorProvider extends DefaultToolBehaviorProvider { ent.addToolEntry(isARelToolEntry); - CreateIsARelationFeature ft1 = new CreateIsARelationFeature((IJPAEditorFeatureProvider) this.getFeatureProvider()); + CreateIsARelationFeature ft1 = new CreateIsARelationFeature(this.getFeatureProvider()); ConnectionCreationToolEntry isARelToolEntry1 = new ConnectionCreationToolEntry(ft1.getCreateName(), ft1.getCreateDescription(), ft1.getCreateImageId(), ft1.getCreateLargeImageId()); isARelToolEntry1.addCreateConnectionFeature(ft1); @@ -370,7 +370,7 @@ public class JPAEditorToolBehaviorProvider extends DefaultToolBehaviorProvider { Integer severity = (Integer) marker.getAttribute(IMarker.SEVERITY); String decoratorType = IPlatformImageConstants.IMG_ECLIPSE_INFORMATION_TSK; if (severity != null) { - switch (severity) { + switch (severity.intValue()) { case 0: decoratorType = IPlatformImageConstants.IMG_ECLIPSE_INFORMATION_TSK; case 1: @@ -391,7 +391,8 @@ public class JPAEditorToolBehaviorProvider extends DefaultToolBehaviorProvider { } } - public String getToolTip(GraphicsAlgorithm ga) { + @Override + public String getToolTip(GraphicsAlgorithm ga) { PictogramElement pe = ga.getPictogramElement(); if (!(ga instanceof Rectangle)) return null; @@ -455,7 +456,7 @@ public class JPAEditorToolBehaviorProvider extends DefaultToolBehaviorProvider { @Override public IContextMenuEntry[] getContextMenu(ICustomContext context) { - ICustomContext customContext = (ICustomContext)context; + ICustomContext customContext = context; PictogramElement[] pictEls = customContext.getPictogramElements(); ICustomFeature saveEntityFeature = new SaveEntityFeature(getFeatureProvider()); diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/AbstractRelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/AbstractRelation.java index b35a2bf707..a16731a796 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/AbstractRelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/AbstractRelation.java @@ -99,10 +99,12 @@ abstract public class AbstractRelation implements IRelation { return inverseAttributeName; } + @Override public int hashCode() { return getId().hashCode(); } + @Override public boolean equals(Object otherRel) { if (!IRelation.class.isInstance(otherRel)) return false; diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/HasReferanceRelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/HasReferanceRelation.java index da8c575010..091c30eb9a 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/HasReferanceRelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/HasReferanceRelation.java @@ -82,12 +82,14 @@ public abstract class HasReferanceRelation { startJpt.getName() + SEPARATOR + relTypeToIdPart.get(relType) + endJpt.getName()+ "-" + embeddedAttributeName; //$NON-NLS-1$
}
+ @Override
public boolean equals(Object otherRel) {
if (!HasReferanceRelation.class.isInstance(otherRel))
return false;
return getId().equals(((HasReferanceRelation)otherRel).getId());
}
+ @Override
public int hashCode() {
return getId().hashCode();
}
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/IsARelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/IsARelation.java index 9654e708d5..c218f17a4e 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/IsARelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/IsARelation.java @@ -89,12 +89,14 @@ public class IsARelation { startJpt.getName() + SEPARATOR + endJpt.getName(); } + @Override public boolean equals(Object otherRel) { if (!IsARelation.class.isInstance(otherRel)) return false; return getId().equals(((IsARelation)otherRel).getId()); } + @Override public int hashCode() { return getId().hashCode(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToManyBiDirRelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToManyBiDirRelation.java index b57a95f916..f3f9a92438 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToManyBiDirRelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToManyBiDirRelation.java @@ -41,10 +41,12 @@ public class ManyToManyBiDirRelation extends ManyToManyRelation implements IBidi /* (non-Javadoc) * @see org.eclipse.jpt.jpadiagrameditor.ui.relations.BidirectionalRelation#getOwnerAnnotatedAttribute() */ + @Override public JavaPersistentAttribute getOwnerAnnotatedAttribute() { return ownerAnnotatedAttribute; } + @Override public void setOwnerAnnotatedAttribute( JavaPersistentAttribute ownerAnnotatedAttribute) { this.ownerAnnotatedAttribute = ownerAnnotatedAttribute; @@ -53,10 +55,12 @@ public class ManyToManyBiDirRelation extends ManyToManyRelation implements IBidi /* (non-Javadoc) * @see org.eclipse.jpt.jpadiagrameditor.ui.relations.BidirectionalRelation#getInverseAnnotatedAttribute() */ + @Override public JavaPersistentAttribute getInverseAnnotatedAttribute() { return inverseAnnotatedAttribute; } + @Override public void setInverseAnnotatedAttribute( JavaPersistentAttribute inverseAnnotatedAttribute) { this.inverseAnnotatedAttribute = inverseAnnotatedAttribute; @@ -78,6 +82,7 @@ public class ManyToManyBiDirRelation extends ManyToManyRelation implements IBidi JpaArtifactFactory.instance().addManyToManyBidirectionalRelation(fp, owner, ownerAnnotatedAttribute, inverse, inverseAnnotatedAttribute, isMap); } + @Override public RelDir getRelDir() { return RelDir.BI; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToManyRelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToManyRelation.java index 16833b4f0c..88fe5b2494 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToManyRelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToManyRelation.java @@ -23,6 +23,7 @@ public abstract class ManyToManyRelation extends AbstractRelation { super(owner, inverse); } + @Override public RelType getRelType() { return RelType.MANY_TO_MANY; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToManyUniDirRelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToManyUniDirRelation.java index db27555b34..554a1b59b8 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToManyUniDirRelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToManyUniDirRelation.java @@ -52,6 +52,7 @@ public class ManyToManyUniDirRelation extends ManyToManyRelation implements IUni } + @Override public RelDir getRelDir() { return RelDir.UNI; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToOneBiDirRelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToOneBiDirRelation.java index e83431cc08..03cbc2c6fd 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToOneBiDirRelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToOneBiDirRelation.java @@ -38,18 +38,22 @@ public class ManyToOneBiDirRelation extends ManyToOneRelation implements IBidir } + @Override public JavaPersistentAttribute getOwnerAnnotatedAttribute() { return ownerAnnotatedAttribute; } + @Override public void setOwnerAnnotatedAttribute( JavaPersistentAttribute ownerAnnotatedAttribute) { this.ownerAnnotatedAttribute = ownerAnnotatedAttribute; } + @Override public JavaPersistentAttribute getInverseAnnotatedAttribute() { return inverseAnnotatedAttribute; } + @Override public void setInverseAnnotatedAttribute(JavaPersistentAttribute inverseAnnotatedAttribute) { this.inverseAnnotatedAttribute = inverseAnnotatedAttribute; } @@ -68,6 +72,7 @@ public class ManyToOneBiDirRelation extends ManyToOneRelation implements IBidir JpaArtifactFactory.instance().addManyToOneBidirectionalRelation(fp, owner, ownerAnnotatedAttribute, inverse, inverseAnnotatedAttribute, isMap); } + @Override public RelDir getRelDir() { return RelDir.BI; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToOneRelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToOneRelation.java index f0df131185..09c934ef15 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToOneRelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToOneRelation.java @@ -23,6 +23,7 @@ abstract public class ManyToOneRelation extends AbstractRelation{ super(owner, inverse); } + @Override public RelType getRelType() { return RelType.MANY_TO_ONE; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToOneUniDirRelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToOneUniDirRelation.java index fcbbd72048..778cbc0b99 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToOneUniDirRelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToOneUniDirRelation.java @@ -48,6 +48,7 @@ public class ManyToOneUniDirRelation extends ManyToOneRelation implements IUnidi } + @Override public RelDir getRelDir() { return RelDir.UNI; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToManyRelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToManyRelation.java index d35e713acc..5d60ea641f 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToManyRelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToManyRelation.java @@ -23,6 +23,7 @@ public abstract class OneToManyRelation extends AbstractRelation { super(owner, inverse); } + @Override public RelType getRelType() { return RelType.ONE_TO_MANY; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToManyUniDirRelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToManyUniDirRelation.java index e5c5da843e..5e0588a87c 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToManyUniDirRelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToManyUniDirRelation.java @@ -51,6 +51,7 @@ public class OneToManyUniDirRelation extends OneToManyRelation implements IUnidi JpaArtifactFactory.instance().addOneToManyUnidirectionalRelation(fp, owner, ownerAnnotatedAttribute, isMap); } + @Override public RelDir getRelDir() { return RelDir.UNI; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToOneBiDirRelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToOneBiDirRelation.java index 56ef13519e..79ae9c0522 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToOneBiDirRelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToOneBiDirRelation.java @@ -35,19 +35,23 @@ public class OneToOneBiDirRelation extends OneToOneRelation implements IBidirect createRelation(fp, embeddingEntity); } + @Override public JavaPersistentAttribute getOwnerAnnotatedAttribute() { return ownerAnnotatedAttribute; } + @Override public void setOwnerAnnotatedAttribute( JavaPersistentAttribute ownerAnnotatedAttribute) { this.ownerAnnotatedAttribute = ownerAnnotatedAttribute; } + @Override public JavaPersistentAttribute getInverseAnnotatedAttribute() { return inverseAnnotatedAttribute; } + @Override public void setInverseAnnotatedAttribute( JavaPersistentAttribute inverseAnnotatedAttribute) { this.inverseAnnotatedAttribute = inverseAnnotatedAttribute; @@ -64,6 +68,7 @@ public class OneToOneBiDirRelation extends OneToOneRelation implements IBidirect JpaArtifactFactory.instance().addOneToOneBidirectionalRelation(fp, owner, ownerAnnotatedAttribute, inverse, inverseAnnotatedAttribute); } + @Override public RelDir getRelDir() { return RelDir.BI; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToOneRelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToOneRelation.java index 12119f3008..036c1a1dda 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToOneRelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToOneRelation.java @@ -24,6 +24,7 @@ abstract public class OneToOneRelation extends AbstractRelation { super(owner, inverse); } + @Override public RelType getRelType() { return RelType.ONE_TO_ONE; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToOneUniDirRelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToOneUniDirRelation.java index b7a4facbc2..6371bbfd84 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToOneUniDirRelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToOneUniDirRelation.java @@ -47,6 +47,7 @@ public class OneToOneUniDirRelation extends OneToOneRelation implements IUnidire JpaArtifactFactory.instance().addOneToOneUnidirectionalRelation(fp, owner, ownerAnnotatedAttribute); } + @Override public RelDir getRelDir() { return RelDir.UNI; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/EntitiesCoordinatesXML.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/EntitiesCoordinatesXML.java index 971ae1aea9..f9407f1fb4 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/EntitiesCoordinatesXML.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/EntitiesCoordinatesXML.java @@ -70,7 +70,7 @@ public class EntitiesCoordinatesXML { public EntitiesCoordinatesXML(String projectName){ Iterator<JpaProject> iter = getJpaProjectManager().getJpaProjects().iterator(); while (iter.hasNext()) { - JpaProject jpaProject = (JpaProject) iter.next(); + JpaProject jpaProject = iter.next(); if(jpaProject.getName().equalsIgnoreCase(projectName)){ this.projectName = jpaProject.getName(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/GraphicsUpdater.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/GraphicsUpdater.java index 3596a6f77e..a24442d9fc 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/GraphicsUpdater.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/GraphicsUpdater.java @@ -174,6 +174,7 @@ public class GraphicsUpdater { if (!txt.getValue().equals(newHeader)) { TransactionalEditingDomain ted = TransactionUtil.getEditingDomain(txt); RecordingCommand rc = new RecordingCommand(ted) { + @Override protected void doExecute() { txt.setValue(newHeader); } @@ -187,7 +188,7 @@ public class GraphicsUpdater { return null; List<Shape> shapes = entityShape.getChildren(); Iterator<Shape> shIt = shapes.iterator(); - Shape headerShape = null;; + Shape headerShape = null; while (shIt.hasNext()) { headerShape = shIt.next(); String shapeType = Graphiti.getPeService().getPropertyValue(headerShape, JPAEditorConstants.PROP_SHAPE_TYPE); diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPAEditorConstants.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPAEditorConstants.java index 3929af2f29..7e76a45bed 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPAEditorConstants.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPAEditorConstants.java @@ -30,7 +30,7 @@ public class JPAEditorConstants { Entity, MappedSupeclass, Embeddable - }; + } public static final String IS_A_RELATION_ID_PREFIX = "is_a_relation:"; //$NON-NLS-1$ @@ -95,11 +95,11 @@ public class JPAEditorConstants { public final static String TRUE_STRING = Boolean.toString(true); - public final static int CONNECTION_LINE_WIDTH = 2; - public final static int IS_A_CONNECTION_LINE_WIDTH = 2; - public final static int EMBEDDED_CONNECTION_LINE_WIDTH = 2; + public final static Integer CONNECTION_LINE_WIDTH = Integer.valueOf(2); + public final static Integer IS_A_CONNECTION_LINE_WIDTH = Integer.valueOf(2); + public final static Integer EMBEDDED_CONNECTION_LINE_WIDTH =Integer.valueOf(2); - public final static int ENTITY_BORDER_WIDTH = 2; + public final static Integer ENTITY_BORDER_WIDTH = Integer.valueOf(2); public final static int ENTITY_CORNER_WIDTH = 6; public final static int ENTITY_CORNER_HEIGHT = 6; @@ -174,7 +174,7 @@ public class JPAEditorConstants { public static String CARDINALITY_ONE = "1"; //$NON-NLS-1$ public static String CARDINALITY_ZERO_N = "0..N"; //$NON-NLS-1$ - public static enum ShapeType {ICON, HEADER, ATTRIBUTE, COMPARTMENT}; + public static enum ShapeType {ICON, HEADER, ATTRIBUTE, COMPARTMENT} static { ANNOTATION_NAME_TO_KEY.put(ANNOTATION_BASIC, MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPAEditorUtil.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPAEditorUtil.java index a0a464d884..c7408ae0db 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPAEditorUtil.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPAEditorUtil.java @@ -657,7 +657,7 @@ public class JPAEditorUtil { } if (Math.abs(y - startCenterY) + 0.1 > startHalfHeight) { - startHorizontal = false;; + startHorizontal = false; x = startCenterX + Math.round(Math.abs(startHalfHeight / yDelta) * xDelta); y = startCenterY + Math.round(startHalfHeight * Math.signum(yDelta)); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPASolver.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPASolver.java index de3c95a852..bf280b3ab1 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPASolver.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPASolver.java @@ -644,7 +644,6 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { WeakReference<AttributeJoiningStrategyPropertyChangeListener> lsnrRef = attributeJoiningStrategyToPropListener.get(jpa); AttributeJoiningStrategyPropertyChangeListener lsnr = null; lsnrRef = attributeJoiningStrategyToPropListener.get(jpa); - lsnr = null; if (lsnrRef != null) lsnr = lsnrRef.get(); if (lsnr == null) { @@ -670,7 +669,6 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { WeakReference<AttributeRelationshipReferencePropertyChangeListener> lsnrRef = attributeRelationshipReferenceToPropListener.get(jpa); AttributeRelationshipReferencePropertyChangeListener lsnr = null; lsnrRef = attributeRelationshipReferenceToPropListener.get(jpa); - lsnr = null; if (lsnrRef != null) lsnr = lsnrRef.get(); if (lsnr == null) { @@ -766,7 +764,6 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { WeakReference<AttributeJoiningStrategyPropertyChangeListener> lsnrRef = attributeJoiningStrategyToPropListener.get(jpa); PropertyChangeListener lsnr = null; lsnrRef = attributeJoiningStrategyToPropListener.get(jpa); - lsnr = null; if (lsnrRef != null) lsnr = lsnrRef.get(); if (lsnr != null) { @@ -793,7 +790,6 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { WeakReference<AttributeMappingOptionalityChangeListener> lsnrRef = attributeMappingOptionalityToPropListener.get(jpa); PropertyChangeListener lsnr = null; lsnrRef = attributeMappingOptionalityToPropListener.get(jpa); - lsnr = null; if (lsnrRef != null) lsnr = lsnrRef.get(); if (lsnr != null) { @@ -814,7 +810,6 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { WeakReference<AttributeRelationshipReferencePropertyChangeListener> lsnrRef = attributeRelationshipReferenceToPropListener.get(jpa); PropertyChangeListener lsnr = null; lsnrRef = attributeRelationshipReferenceToPropListener.get(jpa); - lsnr = null; if (lsnrRef != null) lsnr = lsnrRef.get(); if (lsnr != null) { diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/AllJpaEditorTests.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/AllJpaEditorTests.java index 0bfeb20161..48c258a6f2 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/AllJpaEditorTests.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/AllJpaEditorTests.java @@ -70,7 +70,7 @@ import org.junit.runners.Suite.SuiteClasses; DeleteRelationFeatureTest.class, // CreateRelationsTest.class }) - +@SuppressWarnings("nls") public class AllJpaEditorTests { /** diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/JPACreateFactory.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/JPACreateFactory.java index 761e6647e8..5f1f11c3a6 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/JPACreateFactory.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/JPACreateFactory.java @@ -63,7 +63,7 @@ import org.eclipse.wst.common.project.facet.core.IFacetedProject; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; -@SuppressWarnings("restriction") +@SuppressWarnings({"restriction", "nls"}) public class JPACreateFactory { public static final String JPA_JAR_NAME_SYSTEM_PROPERTY = "org.eclipse.jpt.jpa.jar"; diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/editor/CreateDiagramTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/editor/CreateDiagramTest.java index e767ac1d53..9491bb9364 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/editor/CreateDiagramTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/editor/CreateDiagramTest.java @@ -32,6 +32,7 @@ import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.JpaArtifactFactory; import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.JPACreateFactory; import org.junit.Test; +@SuppressWarnings("nls") public class CreateDiagramTest { @Test @@ -49,6 +50,7 @@ public class CreateDiagramTest { createDiagramRunnable.setRule(ResourcesPlugin.getWorkspace().getRoot()); final Semaphore s = new Semaphore(0); createDiagramRunnable.addJobChangeListener(new JobChangeAdapter(){ + @Override public void done(IJobChangeEvent event) { s.release(); } diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/editor/EditorTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/editor/EditorTest.java index 2fea541d2a..9cbd9e4ee1 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/editor/EditorTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/editor/EditorTest.java @@ -39,7 +39,7 @@ import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleListener; -@SuppressWarnings("restriction") +@SuppressWarnings({"restriction", "nls"}) public class EditorTest { @Test @@ -121,6 +121,7 @@ public class EditorTest { return provider; } + @Override public IWorkbenchPartSite getSite() { return site; } diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/AddJPAEntityFeatureTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/AddJPAEntityFeatureTest.java index 4b6269fb21..b2c793c2ab 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/AddJPAEntityFeatureTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/AddJPAEntityFeatureTest.java @@ -41,6 +41,7 @@ import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeaturePr import org.junit.Before; import org.junit.Test; +@SuppressWarnings("nls") public class AddJPAEntityFeatureTest { private IJPAEditorFeatureProvider featureProvider; diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/ClickAddFeatureTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/ClickAddFeatureTest.java index 018126740e..ba66a6aa3c 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/ClickAddFeatureTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/ClickAddFeatureTest.java @@ -39,6 +39,7 @@ import org.eclipse.ui.IWorkbenchPartSite; import org.junit.Before; import org.junit.Test; +@SuppressWarnings("nls") public class ClickAddFeatureTest { private IJPAEditorFeatureProvider featureProvider; diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/CreateDeleteOnlyAttributeTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/CreateDeleteOnlyAttributeTest.java index a9e61bb0eb..bed0addb0f 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/CreateDeleteOnlyAttributeTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/CreateDeleteOnlyAttributeTest.java @@ -52,6 +52,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +@SuppressWarnings("nls") public class CreateDeleteOnlyAttributeTest { private IJPAEditorFeatureProvider featureProvider; @@ -203,7 +204,7 @@ public class CreateDeleteOnlyAttributeTest { public void listCleared(ListClearEvent arg0) { } - }; + } @After public void tearDown() throws Exception { diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/CreateRelationFeaturesTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/CreateRelationFeaturesTest.java index d7806ce1da..27b7d8e0ef 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/CreateRelationFeaturesTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/CreateRelationFeaturesTest.java @@ -60,6 +60,7 @@ import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.JPACreateFactory; import org.junit.Before; import org.junit.Test; +@SuppressWarnings("nls") public class CreateRelationFeaturesTest { final String TEST_PROJECT = "Test"; private JpaProject jpaProject = null; diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/DirectEditAttributeFeatureTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/DirectEditAttributeFeatureTest.java index a48ee0dd5c..026dbb2316 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/DirectEditAttributeFeatureTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/DirectEditAttributeFeatureTest.java @@ -35,6 +35,7 @@ import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeaturePr import org.junit.Before; import org.junit.Test; +@SuppressWarnings("nls") public class DirectEditAttributeFeatureTest { /** diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/OpenMiniatureViewFeatureTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/OpenMiniatureViewFeatureTest.java index 80b95a5c7d..474e0cd048 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/OpenMiniatureViewFeatureTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/OpenMiniatureViewFeatureTest.java @@ -32,6 +32,7 @@ import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.JPACreateFactory; import org.junit.Before; import org.junit.Test; +@SuppressWarnings("nls") public class OpenMiniatureViewFeatureTest { private IJPAEditorFeatureProvider featureProvider; diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/RefactorAttributeTypeFeatureTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/RefactorAttributeTypeFeatureTest.java index 4f600313fb..dfb038ae91 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/RefactorAttributeTypeFeatureTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/RefactorAttributeTypeFeatureTest.java @@ -40,6 +40,7 @@ import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.JPACreateFactory; import org.junit.Before; import org.junit.Test; +@SuppressWarnings("nls") public class RefactorAttributeTypeFeatureTest { private IJPAEditorFeatureProvider featureProvider; diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/RemoveAttributeFeatureTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/RemoveAttributeFeatureTest.java index 31b46a400a..fee1838588 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/RemoveAttributeFeatureTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/RemoveAttributeFeatureTest.java @@ -44,6 +44,7 @@ import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.JPACreateFactory; import org.junit.Before; import org.junit.Test; +@SuppressWarnings("nls") public class RemoveAttributeFeatureTest { private IJPAEditorFeatureProvider featureProvider; diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/SaveEntityFeatureTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/SaveEntityFeatureTest.java index b39bde15ec..80a249f10f 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/SaveEntityFeatureTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/SaveEntityFeatureTest.java @@ -35,6 +35,7 @@ import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.JPACreateFactory; import org.junit.Before; import org.junit.Test; +@SuppressWarnings("nls") public class SaveEntityFeatureTest { final String TEST_PROJECT = "Test"; private JpaProject jpaProject = null; diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/UpdateAttributeFeatureTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/UpdateAttributeFeatureTest.java index 792c7c31d3..791a5b1ff0 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/UpdateAttributeFeatureTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/UpdateAttributeFeatureTest.java @@ -40,6 +40,7 @@ import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.JPACreateFactory; import org.junit.Before; import org.junit.Test; +@SuppressWarnings("nls") public class UpdateAttributeFeatureTest { private IJPAEditorFeatureProvider featureProvider; diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/listener/JPAProjectListenerTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/listener/JPAProjectListenerTest.java index 524e60d755..19e416b6d1 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/listener/JPAProjectListenerTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/listener/JPAProjectListenerTest.java @@ -44,7 +44,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; - +@SuppressWarnings("nls") public class JPAProjectListenerTest { private IJPAEditorFeatureProvider featureProvider; final String TEST_PROJECT = "Test"; diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/modelintegration/ui/ModelIntegrationTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/modelintegration/ui/ModelIntegrationTest.java index be55db9ff4..a5a92e84c9 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/modelintegration/ui/ModelIntegrationTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/modelintegration/ui/ModelIntegrationTest.java @@ -50,6 +50,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +@SuppressWarnings("nls") public class ModelIntegrationTest { private static final String CODE_GENERATED = "CODE_GENERATED"; diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/modelintegration/util/ModelIntegrationUtilTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/modelintegration/util/ModelIntegrationUtilTest.java index 4c8dfe3d51..e168833b64 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/modelintegration/util/ModelIntegrationUtilTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/modelintegration/util/ModelIntegrationUtilTest.java @@ -35,7 +35,7 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.BundleListener; -@SuppressWarnings("unchecked") +@SuppressWarnings({"unchecked", "nls"}) public class ModelIntegrationUtilTest { @Test diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/provider/JPAEditorFeatureProviderTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/provider/JPAEditorFeatureProviderTest.java index ccc443ab7e..ec8bdc6160 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/provider/JPAEditorFeatureProviderTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/provider/JPAEditorFeatureProviderTest.java @@ -42,7 +42,7 @@ import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.IJpaSolver; import org.junit.Before; import org.junit.Test; - +@SuppressWarnings("nls") public class JPAEditorFeatureProviderTest { diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/provider/JPAEditorToolBehaviorProviderTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/provider/JPAEditorToolBehaviorProviderTest.java index a987680cdb..5d53254511 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/provider/JPAEditorToolBehaviorProviderTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/provider/JPAEditorToolBehaviorProviderTest.java @@ -44,6 +44,7 @@ import org.eclipse.ui.PartInitException; import org.junit.Before; import org.junit.Test; +@SuppressWarnings("nls") public class JPAEditorToolBehaviorProviderTest { /** diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationAttributesTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationAttributesTest.java index 78b8f2cf94..f97b193463 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationAttributesTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationAttributesTest.java @@ -43,6 +43,7 @@ import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.JPACreateFactory; import org.junit.Before; import org.junit.Test; +@SuppressWarnings("nls") public class CreateRelationAttributesTest { private IJPAEditorFeatureProvider featureProvider; diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationsInFieldAnnotatedEntitiesTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationsInFieldAnnotatedEntitiesTest.java index d59eb23f0f..429469690b 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationsInFieldAnnotatedEntitiesTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationsInFieldAnnotatedEntitiesTest.java @@ -45,6 +45,7 @@ import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.JpaArtifactFactory; import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.JPACreateFactory; import org.junit.Before; import org.junit.Test; +@SuppressWarnings("nls") public class CreateRelationsInFieldAnnotatedEntitiesTest { diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/CreateDeleteEntity.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/CreateDeleteEntity.java index 6bf22d4698..9cef08c97e 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/CreateDeleteEntity.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/CreateDeleteEntity.java @@ -31,7 +31,7 @@ import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.JPACreateFactory; import org.junit.Before; import org.junit.Test; - +@SuppressWarnings("nls") public class CreateDeleteEntity { private static final String TEST_PROJECT = "Test"; diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/JPAEditorUtilTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/JPAEditorUtilTest.java index 943bb8e8fd..e3aba3e5e2 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/JPAEditorUtilTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/JPAEditorUtilTest.java @@ -49,6 +49,7 @@ import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.JPACreateFactory; import org.eclipse.swt.graphics.Point; import org.junit.Test; +@SuppressWarnings("nls") public class JPAEditorUtilTest { @Test public void testCapitalizeFirstLetter() { diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/JPASolverTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/JPASolverTest.java index d578244747..fc6663c4d5 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/JPASolverTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/JPASolverTest.java @@ -53,7 +53,7 @@ import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.JPASolver; import org.junit.Before; import org.junit.Test; -@SuppressWarnings("unused") +@SuppressWarnings({"unused", "nls"}) public class JPASolverTest { private IEclipseFacade eclipseFacade; diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/JpaArtifactFactoryTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/JpaArtifactFactoryTest.java index 336ba1e09d..67327d9e97 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/JpaArtifactFactoryTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/JpaArtifactFactoryTest.java @@ -40,6 +40,7 @@ import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.JPACreateFactory; import org.junit.Before; import org.junit.Test; +@SuppressWarnings("nls") public class JpaArtifactFactoryTest { String TEST_PROJECT = "Test"; @@ -196,6 +197,6 @@ public class JpaArtifactFactoryTest { public void listCleared(ListClearEvent arg0) { } - }; + } } diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/URLEscaper.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/URLEscaper.java index 1a66ba2c0c..4be34e70cf 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/URLEscaper.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/URLEscaper.java @@ -1,5 +1,6 @@ package org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.util; +@SuppressWarnings("nls") public class URLEscaper { private static final String specialChars = " <>#%{}|^~[]`;?@=&$"; private static final String escapeCodes = "%20%3C%3E%23%25%7B%7D%7C%5E%7E%5B%5D%60%3B%3F%40%3D%26%24"; |