Browse Source

Changes for Java 1.5 compatibility

benjamin.schwertfeger@googlemail.com 12 years ago
parent
commit
9d2b644ba4

+ 1 - 1
plugins/org.yakindu.sct.refactoring/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 	<classpathentry kind="output" path="bin"/>

+ 3 - 4
plugins/org.yakindu.sct.refactoring/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +1,7 @@
-#Fri Jun 08 14:30:59 CEST 2012
 eclipse.preferences.version=1
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.5

+ 0 - 1
plugins/org.yakindu.sct.refactoring/src/org/yakindu/sct/refactoring/Activator.java

@@ -54,7 +54,6 @@ public class Activator extends AbstractUIPlugin implements IStartup {
 		return plugin;
 		return plugin;
 	}
 	}
 
 
-	@Override
 	public void earlyStartup() {
 	public void earlyStartup() {
 		// This plugin is registered for early startup to load all
 		// This plugin is registered for early startup to load all
 		// Handlerclasses to calculate the enabled state
 		// Handlerclasses to calculate the enabled state

+ 0 - 1
plugins/org.yakindu.sct.refactoring/src/org/yakindu/sct/refactoring/handlers/AbstractRefactoringHandler.java

@@ -60,7 +60,6 @@ public abstract class AbstractRefactoringHandler<T extends Object> extends Abstr
 		return refactoring.isExecutable();
 		return refactoring.isExecutable();
 	}
 	}
 
 
-	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		refactoring.execute();
 		refactoring.execute();
 		return null;
 		return null;

+ 0 - 1
plugins/org.yakindu.sct.refactoring/src/org/yakindu/sct/refactoring/handlers/impl/RenameElementHandler.java

@@ -169,7 +169,6 @@ public class RenameElementHandler extends AbstractRefactoringHandler<NamedElemen
 			}
 			}
 		}
 		}
 
 
-		@Override
 		public String isValid(String newText) {
 		public String isValid(String newText) {
 			return existingNames.contains(newText)? "Name already exists!": null;
 			return existingNames.contains(newText)? "Name already exists!": null;
 		}
 		}

+ 0 - 2
plugins/org.yakindu.sct.refactoring/src/org/yakindu/sct/refactoring/refactor/AbstractRefactoring.java

@@ -61,7 +61,6 @@ public abstract class AbstractRefactoring<T extends Object> implements IRefactor
 	 */
 	 */
 	protected RefactoringHelper helper = new RefactoringHelper();
 	protected RefactoringHelper helper = new RefactoringHelper();
 
 
-	@Override
 	public boolean isExecutable() {
 	public boolean isExecutable() {
 		return getContextObjects() != null && getContextObjects().size() > 0;
 		return getContextObjects() != null && getContextObjects().size() > 0;
 	}
 	}
@@ -84,7 +83,6 @@ public abstract class AbstractRefactoring<T extends Object> implements IRefactor
 	 * Wraps an {@link AbstractTransactionalCommand} around the refactoring
 	 * Wraps an {@link AbstractTransactionalCommand} around the refactoring
 	 * logic.
 	 * logic.
 	 */
 	 */
-	@Override
 	public void execute() {
 	public void execute() {
 		if (!isExecutable()) {
 		if (!isExecutable()) {
 			return;
 			return;

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="src" path="src-gen"/>

+ 3 - 4
test-plugins/org.yakindu.sct.generator.c.test/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +1,7 @@
-#Thu Jan 05 09:07:52 CET 2012
 eclipse.preferences.version=1
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.5

+ 2 - 3
test-plugins/org.yakindu.sct.generator.java.test/.classpath

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="output" path="bin"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
 </classpath>

+ 1 - 1
test-plugins/org.yakindu.sct.refactoring.tests/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 	<classpathentry kind="output" path="bin"/>

+ 3 - 3
test-plugins/org.yakindu.sct.refactoring.tests/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.5