diff --git a/org.eclipse.mylyn.modeling.emf/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.modeling.emf/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.mylyn.modeling.emf/build.properties b/org.eclipse.mylyn.modeling.emf/build.properties
@@ -2,5 +2,7 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.properties
-jre.compilation.profile = JavaSE-1.6
+               plugin.properties,\
+               about.html
+jre.compilation.profile = J2SE-1.5
+src.includes = about.html
diff --git a/org.eclipse.mylyn.modeling.emf/src/org/eclipse/mylyn/modeling/emf/EMFStructureBridge.java b/org.eclipse.mylyn.modeling.emf/src/org/eclipse/mylyn/modeling/emf/EMFStructureBridge.java
@@ -29,6 +29,7 @@
  */
 public abstract class EMFStructureBridge extends DomainDelegatedStructureBridge {
 
+	@Override
 	public String getDomainHandleIdentifier(Object object) {
 		EObject eobject = ((EObject) object);
 		URI uri = EcoreUtil.getURI(eobject);
@@ -103,4 +104,5 @@ public String getParentHandle(String handle) {
 		//Resources don't have parents, unless we want to get the file hierarchy, which probably isn't what we want.
 		return null;
 	}
+
 }
diff --git a/org.eclipse.mylyn.modeling.gmf/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.modeling.gmf/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Thu Aug 18 13:33:38 PDT 2011
+#Sun May 29 17:20:20 CEST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.codeComplete.argumentPrefixes=
 org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -8,6 +8,8 @@ org.eclipse.jdt.core.codeComplete.localPrefixes=
 org.eclipse.jdt.core.codeComplete.localSuffixes=
 org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
 org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
@@ -160,8 +162,10 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
 org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert

diff --git a/org.eclipse.mylyn.modeling.gmf/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.modeling.gmf/.settings/org.eclipse.jdt.ui.prefs
diff --git a/org.eclipse.mylyn.modeling.gmf/build.properties b/org.eclipse.mylyn.modeling.gmf/build.properties
@@ -3,4 +3,7 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               plugin.properties
+               plugin.properties,\
+               about.html
+src.includes = about.html
+jre.compilation.profile = J2SE-1.5
diff --git a/org.eclipse.mylyn.modeling.gmf/src/org/eclipse/mylyn/modeling/gmf/ContextDecorator.java b/org.eclipse.mylyn.modeling.gmf/src/org/eclipse/mylyn/modeling/gmf/ContextDecorator.java
@@ -137,4 +137,5 @@ public IFigure getDecoratedFigure() {
 	public List<IRevealableFigure> getDecorationFigures() {
 		return decorationFigures;
 	}
+
 }
diff --git a/org.eclipse.mylyn.modeling.gmf/src/org/eclipse/mylyn/modeling/gmf/EdgeDecorator.java b/org.eclipse.mylyn.modeling.gmf/src/org/eclipse/mylyn/modeling/gmf/EdgeDecorator.java
@@ -187,4 +187,5 @@ public boolean isLandmark() {
 		// Edges can never be landmarked
 		return false;
 	}
+
 }
diff --git a/org.eclipse.mylyn.modeling.gmf/src/org/eclipse/mylyn/modeling/gmf/GMFStructureBridge.java b/org.eclipse.mylyn.modeling.gmf/src/org/eclipse/mylyn/modeling/gmf/GMFStructureBridge.java
@@ -27,4 +27,5 @@ public Object getDomainObject(Object object) {
 		}
 		return super.getDomainObject(object);
 	}
+
 }
diff --git a/org.eclipse.mylyn.modeling.gmf/src/org/eclipse/mylyn/modeling/gmf/GMFUIBridgePlugin.java b/org.eclipse.mylyn.modeling.gmf/src/org/eclipse/mylyn/modeling/gmf/GMFUIBridgePlugin.java
@@ -64,4 +64,5 @@ public void stop(BundleContext context) throws Exception {
 	public static GMFUIBridgePlugin getDefault() {
 		return INSTANCE;
 	}
+
 }
diff --git a/org.eclipse.mylyn.modeling.gmf/src/org/eclipse/mylyn/modeling/gmf/NodeDecorator.java b/org.eclipse.mylyn.modeling.gmf/src/org/eclipse/mylyn/modeling/gmf/NodeDecorator.java
@@ -53,4 +53,5 @@ public boolean isInteresting() {
 	public boolean isLandmark() {
 		return getProvider().isLandmark(domainObject);
 	}
+
 }
diff --git a/org.eclipse.mylyn.modeling.gmf/src/org/eclipse/mylyn/modeling/gmf/RevealMouseListener.java b/org.eclipse.mylyn.modeling.gmf/src/org/eclipse/mylyn/modeling/gmf/RevealMouseListener.java
@@ -125,4 +125,5 @@ public void mouseMove(MouseEvent e) {
 	public void removeDecoration(IFigure decoration) {
 		lastDecorations.remove(decoration);
 	}
+
 }
diff --git a/org.eclipse.mylyn.modeling.gmf/src/org/eclipse/mylyn/modeling/gmf/figures/FigureChild.java b/org.eclipse.mylyn.modeling.gmf/src/org/eclipse/mylyn/modeling/gmf/figures/FigureChild.java
@@ -52,4 +52,5 @@ void hide() {
 			((Shape) figure).setAlpha(255);
 		}
 	}
+
 }
diff --git a/...se.mylyn.modeling.gmf/src/org/eclipse/mylyn/modeling/gmf/figures/FigureManagerHelper.java b/...se.mylyn.modeling.gmf/src/org/eclipse/mylyn/modeling/gmf/figures/FigureManagerHelper.java
@@ -111,4 +111,5 @@ public Color getColor(Color color1, Color color2, float distance) {
 		}
 		return create(new RGB(hsb[0], hsb[1], hsb[2]));
 	}
+
 }
diff --git a/...pse.mylyn.modeling.gmf/src/org/eclipse/mylyn/modeling/gmf/figures/NodeLandmarkFigure.java b/...pse.mylyn.modeling.gmf/src/org/eclipse/mylyn/modeling/gmf/figures/NodeLandmarkFigure.java
@@ -75,4 +75,5 @@ public void unreveal() {
 	public void restore() {
 		//noop, landmarks are never hidden
 	}
+
 }
diff --git a/...ipse.mylyn.modeling.gmf/src/org/eclipse/mylyn/modeling/gmf/figures/NodeMaskingFigure.java b/...ipse.mylyn.modeling.gmf/src/org/eclipse/mylyn/modeling/gmf/figures/NodeMaskingFigure.java
@@ -66,4 +66,5 @@ public void relocate(IFigure target) {
 			((IFigure) target.getChildren().get(0)).setBounds(decorated.getBounds().getCopy());
 		}
 	}
+
 }
diff --git a/org.eclipse.mylyn.modeling.papyrus/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.modeling.papyrus/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Thu Aug 18 13:36:03 PDT 2011
+#Sun May 29 17:20:20 CEST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.codeComplete.argumentPrefixes=
 org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -8,6 +8,8 @@ org.eclipse.jdt.core.codeComplete.localPrefixes=
 org.eclipse.jdt.core.codeComplete.localSuffixes=
 org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
 org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
@@ -160,8 +162,10 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
 org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert

diff --git a/org.eclipse.mylyn.modeling.papyrus/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.modeling.papyrus/.settings/org.eclipse.jdt.ui.prefs
diff --git a/org.eclipse.mylyn.modeling.papyrus/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.modeling.papyrus/.settings/org.eclipse.pde.prefs
@@ -1,4 +1,4 @@
-#Thu Aug 18 13:36:34 PDT 2011
+#Fri Aug 19 12:07:57 PDT 2011
 compilers.f.unresolved-features=1
 compilers.f.unresolved-plugins=1
 compilers.incompatible-environment=1

diff --git a/org.eclipse.mylyn.modeling.papyrus/build.properties b/org.eclipse.mylyn.modeling.papyrus/build.properties
@@ -4,4 +4,7 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                icons/,\
-               plugin.properties
+               plugin.properties,\
+               about.html
+src.includes = about.html
+jre.compilation.profile = J2SE-1.5
diff --git a/...yn.modeling.papyrus/src/org/eclipse/mylyn/modeling/papyrus/UML2DiagramUIBridgePlugin.java b/...yn.modeling.papyrus/src/org/eclipse/mylyn/modeling/papyrus/UML2DiagramUIBridgePlugin.java
@@ -32,7 +32,6 @@ public class UML2DiagramUIBridgePlugin extends AbstractUIPlugin {
 
 	private DiagramUIEditingMonitor monitor;
 
-
 	public UML2DiagramUIBridgePlugin() {
 	}
 

diff --git a/...lipse.mylyn.modeling.papyrus/src/org/eclipse/mylyn/modeling/papyrus/UML2DomainBridge.java b/...lipse.mylyn.modeling.papyrus/src/org/eclipse/mylyn/modeling/papyrus/UML2DomainBridge.java
@@ -77,4 +77,5 @@ public boolean acceptsEditPart(EObject domainObject, EditPart part) {
 		}
 		return false;
 	}
+
 }
diff --git a/org.eclipse.mylyn.modeling.papyrus/src/org/eclipse/mylyn/modeling/papyrus/UML2UIBridge.java b/org.eclipse.mylyn.modeling.papyrus/src/org/eclipse/mylyn/modeling/papyrus/UML2UIBridge.java
@@ -23,4 +23,5 @@ public class UML2UIBridge extends DiagramUIBridge {
 	public IModelUIProvider getDomainUIBridge() {
 		return UML2DomainBridge.getInstance();
 	}
+
 }
diff --git a/org.eclipse.mylyn.modeling.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.modeling.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Wed Mar 02 16:00:04 PST 2011
+#Sun May 29 17:20:20 CEST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.codeComplete.argumentPrefixes=
 org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -8,6 +8,8 @@ org.eclipse.jdt.core.codeComplete.localPrefixes=
 org.eclipse.jdt.core.codeComplete.localSuffixes=
 org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
 org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

diff --git a/org.eclipse.mylyn.modeling.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.modeling.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/...lyn.modeling.tests/src/org/eclipse/mylyn/modeling/context/AbstractDiagramContextTest.java b/...lyn.modeling.tests/src/org/eclipse/mylyn/modeling/context/AbstractDiagramContextTest.java
@@ -59,4 +59,5 @@ protected void tearDown() throws Exception {
 		assertFalse(manager.isContextActive());
 		super.tearDown();
 	}
+
 }
diff --git a/...e.mylyn.modeling.tests/src/org/eclipse/mylyn/modeling/context/AbstractEMFContextTest.java b/...e.mylyn.modeling.tests/src/org/eclipse/mylyn/modeling/context/AbstractEMFContextTest.java
@@ -44,4 +44,5 @@ protected void tearDown() throws Exception {
 	public IJavaProject getEmfProject() {
 		return emfProject;
 	}
+
 }
diff --git a/...pse.mylyn.modeling.tests/src/org/eclipse/mylyn/modeling/context/BasicEMFResourceTest.java b/...pse.mylyn.modeling.tests/src/org/eclipse/mylyn/modeling/context/BasicEMFResourceTest.java
@@ -72,4 +72,5 @@ protected void tearDown() throws Exception {
 				.getPreferenceStore()
 				.setValue(ResourcesUiPreferenceInitializer.PREF_MODIFIED_DATE_EXCLUSIONS, true);
 	}
+
 }
diff --git a/...e.mylyn.modeling.tests/src/org/eclipse/mylyn/modeling/context/EMFStructureBridgeTest.java b/...e.mylyn.modeling.tests/src/org/eclipse/mylyn/modeling/context/EMFStructureBridgeTest.java
@@ -50,4 +50,5 @@ public void testHandles() throws Exception {
 		assertTrue("Same eobject", !eObject.equals(objectForHandle));
 		assertEquals(fragmentClass.getClassifierID(), obtainedClass.getClassifierID());
 	}
+
 }
diff --git a/...lipse.mylyn.modeling.tests/src/org/eclipse/mylyn/modeling/tests/WorkspaceSetupHelper.java b/...lipse.mylyn.modeling.tests/src/org/eclipse/mylyn/modeling/tests/WorkspaceSetupHelper.java
@@ -179,4 +179,5 @@ public static IMethod getMethod(IType t, String methodName, String[] params) {
 		}
 		return t.getMethod(methodName, params);
 	}
+
 }
diff --git a/org.eclipse.mylyn.modeling.tests/src/org/eclipse/mylyn/modeling/ui/EMFUIBridgeTest.java b/org.eclipse.mylyn.modeling.tests/src/org/eclipse/mylyn/modeling/ui/EMFUIBridgeTest.java
@@ -77,4 +77,5 @@ public void testModification() throws Exception {
 
 		assertEquals(element2.getContentType(), EcoreDomainBridge.ECORE_CONTENT_TYPE);
 	}
+
 }
diff --git a/...yn.modeling.tests/testdata/org.eclipse.mylyn.modeling.tests.ecorediagram/build.properties b/...yn.modeling.tests/testdata/org.eclipse.mylyn.modeling.tests.ecorediagram/build.properties
@@ -1,3 +1,6 @@
 bin.includes = model/,\
                META-INF/,\
-               .
+               .,\
+               about.html
+src.includes = about.html
+jre.compilation.profile = J2SE-1.5
diff --git a/org.eclipse.mylyn.modeling.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.modeling.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Wed Mar 02 16:00:04 PST 2011
+#Sun May 29 17:20:20 CEST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.codeComplete.argumentPrefixes=
 org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -8,6 +8,8 @@ org.eclipse.jdt.core.codeComplete.localPrefixes=
 org.eclipse.jdt.core.codeComplete.localSuffixes=
 org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
 org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

diff --git a/org.eclipse.mylyn.modeling.ui/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.modeling.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/org.eclipse.mylyn.modeling.ui/build.properties b/org.eclipse.mylyn.modeling.ui/build.properties
@@ -14,3 +14,4 @@ bin.includes = META-INF/,\
                about.html,\
                plugin.properties
 src.includes = about.html
+jre.compilation.profile = J2SE-1.5
diff --git a/org.eclipse.mylyn.modeling.ui/src/org/eclipse/mylyn/modeling/ui/DiagramUIEditingMonitor.java b/org.eclipse.mylyn.modeling.ui/src/org/eclipse/mylyn/modeling/ui/DiagramUIEditingMonitor.java
@@ -46,4 +46,5 @@ public void handleWorkbenchPartSelection(IWorkbenchPart part, ISelection selecti
 			}
 		}
 	}
+
 }
diff --git a/org.eclipse.mylyn.modeling.ui/src/org/eclipse/mylyn/modeling/ui/EcoreDomainBridge.java b/org.eclipse.mylyn.modeling.ui/src/org/eclipse/mylyn/modeling/ui/EcoreDomainBridge.java
@@ -62,4 +62,5 @@ public boolean acceptsEditPart(EObject domainObject, EditPart part) {
 		// ignore
 		return false;
 	}
+
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -137,4 +137,5 @@ public IFigure getDecoratedFigure() { @@
     	public List<IRevealableFigure> getDecorationFigures() {
     		return decorationFigures;
     	}
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,7 +32,6 @@ public class UML2DiagramUIBridgePlugin extends AbstractUIPlugin {

		private DiagramUIEditingMonitor monitor;


		public UML2DiagramUIBridgePlugin() {
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -77,4 +77,5 @@ public void testModification() throws Exception {

		assertEquals(element2.getContentType(), EcoreDomainBridge.ECORE_CONTENT_TYPE);
		}

		}