[...] reduced warnings and added dependency for buckminster

20 files changed, 258 insertions, 35 deletions

diff --git a/examples/org.eclipse.etrice.tutorials/.settings/org.eclipse.jdt.core.prefs b/examples/org.eclipse.etrice.tutorials/.settings/org.eclipse.jdt.core.prefs
index 4b0664ccc..712edee6e 100644
--- a/examples/org.eclipse.etrice.tutorials/.settings/org.eclipse.jdt.core.prefs
+++ b/examples/org.eclipse.etrice.tutorials/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,81 @@
-#Tue Apr 05 15:46:50 CEST 2011

+#Mon Sep 19 09:33:05 CEST 2011

 eclipse.preferences.version=1

 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

 org.eclipse.jdt.core.compiler.compliance=1.6

+org.eclipse.jdt.core.compiler.debug.lineNumber=generate

+org.eclipse.jdt.core.compiler.debug.localVariable=generate

+org.eclipse.jdt.core.compiler.debug.sourceFile=generate

+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning

 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore

+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning

+org.eclipse.jdt.core.compiler.problem.deadCode=warning

+org.eclipse.jdt.core.compiler.problem.deprecation=warning

+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled

+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning

+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore

 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore

+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled

+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore

+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning

+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning

+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error

+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning

+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled

+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning

+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore

+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore

+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore

+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning

+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore

+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore

+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore

+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled

+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore

+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning

+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning

+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore

+org.eclipse.jdt.core.compiler.problem.nullReference=warning

+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning

+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore

+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore

+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore

+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning

+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore

+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore

+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore

+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore

+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled

+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning

+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled

+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled

+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore

+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning

+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled

+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning

+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning

+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore

+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore

+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled

+org.eclipse.jdt.core.compiler.problem.unusedImport=ignore

+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning

+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore

+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled

+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled

+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning

+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

 org.eclipse.jdt.core.compiler.source=1.6

diff --git a/examples/org.eclipse.etrice.tutorials/build.properties b/examples/org.eclipse.etrice.tutorials/build.properties
index 41eb6ade2..bfa526304 100644
--- a/examples/org.eclipse.etrice.tutorials/build.properties
+++ b/examples/org.eclipse.etrice.tutorials/build.properties
@@ -1,4 +1,5 @@
-source.. = src/

+source.. = src/,\

+           src-gen/

 output.. = bin/

 bin.includes = META-INF/,\

                .

diff --git a/examples/org.eclipse.etrice.tutorials/src/org/eclipse/etrice/tutorials/PedLightGUI/WindowClosingAdapter.java b/examples/org.eclipse.etrice.tutorials/src/org/eclipse/etrice/tutorials/PedLightGUI/WindowClosingAdapter.java
index 93005f395..058760cee 100644
--- a/examples/org.eclipse.etrice.tutorials/src/org/eclipse/etrice/tutorials/PedLightGUI/WindowClosingAdapter.java
+++ b/examples/org.eclipse.etrice.tutorials/src/org/eclipse/etrice/tutorials/PedLightGUI/WindowClosingAdapter.java
@@ -23,7 +23,6 @@ import java.awt.event.*;
  * @author Thomas Jung

  * 

 **/

-@SuppressWarnings("unused")

 public class WindowClosingAdapter

 extends WindowAdapter

 {

diff --git a/modellib/org.eclipse.etrice.modellib/.settings/org.eclipse.jdt.core.prefs b/modellib/org.eclipse.etrice.modellib/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..6a5ce29df
--- /dev/null
+++ b/modellib/org.eclipse.etrice.modellib/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,71 @@
+#Mon Sep 19 09:34:05 CEST 2011

+eclipse.preferences.version=1

+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning

+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore

+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning

+org.eclipse.jdt.core.compiler.problem.deadCode=warning

+org.eclipse.jdt.core.compiler.problem.deprecation=warning

+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled

+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning

+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore

+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore

+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled

+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore

+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning

+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning

+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error

+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning

+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled

+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning

+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore

+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore

+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore

+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning

+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore

+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore

+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore

+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled

+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore

+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning

+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning

+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore

+org.eclipse.jdt.core.compiler.problem.nullReference=warning

+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning

+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore

+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore

+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore

+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning

+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore

+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore

+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore

+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore

+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled

+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning

+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled

+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled

+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore

+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning

+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled

+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning

+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning

+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore

+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore

+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled

+org.eclipse.jdt.core.compiler.problem.unusedImport=ignore

+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning

+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore

+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled

+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled

+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning

+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

diff --git a/modellib/org.eclipse.etrice.modellib/META-INF/MANIFEST.MF b/modellib/org.eclipse.etrice.modellib/META-INF/MANIFEST.MF
index 3de481d7f..60c0dc3cb 100644
--- a/modellib/org.eclipse.etrice.modellib/META-INF/MANIFEST.MF
+++ b/modellib/org.eclipse.etrice.modellib/META-INF/MANIFEST.MF
@@ -5,3 +5,4 @@ Bundle-SymbolicName: org.eclipse.etrice.modellib
 Bundle-Version: 0.1.0.qualifier

 Bundle-Vendor: eTrice (Incubation)

 Export-Package: room.basic.service.timing

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/modellib/org.eclipse.etrice.modellib/build.properties b/modellib/org.eclipse.etrice.modellib/build.properties
index 5e3728557..ef9db09a9 100644
--- a/modellib/org.eclipse.etrice.modellib/build.properties
+++ b/modellib/org.eclipse.etrice.modellib/build.properties
@@ -1 +1,3 @@
+source.. = src-gen/

+output.. = bin/

 bin.includes = META-INF/

diff --git a/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF
index b2e9d4c1d..fd81b3ed8 100644
--- a/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Documentation

 Bundle-SymbolicName: org.eclipse.etrice.doc; singleton:=true

 Bundle-Version: 0.1.0.qualifier

-Bundle-Activator: org.eclipse.etrice.doc.Activator

 Bundle-Vendor: eTrice (Incubation)

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime

diff --git a/plugins/org.eclipse.etrice.generator.java/build.properties b/plugins/org.eclipse.etrice.generator.java/build.properties
index bc3bc5061..53ae97bc0 100644
--- a/plugins/org.eclipse.etrice.generator.java/build.properties
+++ b/plugins/org.eclipse.etrice.generator.java/build.properties
@@ -1,4 +1,5 @@
-source.. = src/

+source.. = src/,\

+           xtend-gen/

 bin.includes = META-INF/,\

                .,\

                plugin.xml

diff --git a/plugins/org.eclipse.etrice.generator.launch/build.properties b/plugins/org.eclipse.etrice.generator.launch/build.properties
index 6f20375d6..41eb6ade2 100644
--- a/plugins/org.eclipse.etrice.generator.launch/build.properties
+++ b/plugins/org.eclipse.etrice.generator.launch/build.properties
@@ -1,5 +1,4 @@
 source.. = src/

 output.. = bin/

 bin.includes = META-INF/,\

-               .,\

-               plugin.xml

+               .

diff --git a/plugins/org.eclipse.etrice.generator/build.properties b/plugins/org.eclipse.etrice.generator/build.properties
index b10b95c1e..d23cb3abc 100644
--- a/plugins/org.eclipse.etrice.generator/build.properties
+++ b/plugins/org.eclipse.etrice.generator/build.properties
@@ -10,5 +10,6 @@ bin.includes = .,\
                plugin.xml

 jars.compile.order = .

 source.. = src/,\

-           model/

+           model/,\

+           xtend-gen/

 output.. = bin/

diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/util/ETriceGenSwitch.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/util/ETriceGenSwitch.java
index 000e52227..e71308fa0 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/util/ETriceGenSwitch.java
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/util/ETriceGenSwitch.java
@@ -6,19 +6,32 @@
  */

 package org.eclipse.etrice.generator.etricegen.util;

 

-import java.util.List;

-

-import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.util.Switch;

 import org.eclipse.etrice.core.room.ActorClass;

 import org.eclipse.etrice.core.room.ActorContainerClass;

 import org.eclipse.etrice.core.room.RoomClass;

 import org.eclipse.etrice.core.room.StructureClass;

-

-import org.eclipse.etrice.generator.etricegen.*;

+import org.eclipse.etrice.generator.etricegen.ActiveTrigger;

+import org.eclipse.etrice.generator.etricegen.ActorInstance;

+import org.eclipse.etrice.generator.etricegen.BindingInstance;

+import org.eclipse.etrice.generator.etricegen.ConnectionInstance;

+import org.eclipse.etrice.generator.etricegen.Counter;

+import org.eclipse.etrice.generator.etricegen.ETriceGenPackage;

+import org.eclipse.etrice.generator.etricegen.ExpandedActorClass;

+import org.eclipse.etrice.generator.etricegen.IDiagnostician;

+import org.eclipse.etrice.generator.etricegen.ITransitionChainVisitor;

+import org.eclipse.etrice.generator.etricegen.InstanceBase;

+import org.eclipse.etrice.generator.etricegen.InterfaceItemInstance;

+import org.eclipse.etrice.generator.etricegen.PortInstance;

+import org.eclipse.etrice.generator.etricegen.Root;

+import org.eclipse.etrice.generator.etricegen.SAPInstance;

+import org.eclipse.etrice.generator.etricegen.SPPInstance;

+import org.eclipse.etrice.generator.etricegen.ServiceImplInstance;

+import org.eclipse.etrice.generator.etricegen.StructureInstance;

+import org.eclipse.etrice.generator.etricegen.SubSystemInstance;

+import org.eclipse.etrice.generator.etricegen.TransitionChain;

 

 /**

  * <!-- begin-user-doc -->

diff --git a/plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/concurrency/EditingDomainAdapter.java b/plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/concurrency/EditingDomainAdapter.java
index 2655e9339..f80f02b26 100644
--- a/plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/concurrency/EditingDomainAdapter.java
+++ b/plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/concurrency/EditingDomainAdapter.java
@@ -12,6 +12,7 @@
 

 package org.eclipse.etrice.ui.common.concurrency;

 

+import java.util.HashMap;

 import java.util.List;

 import java.util.Map;

 

@@ -46,7 +47,6 @@ import org.eclipse.xtext.ui.editor.IDirtyStateManager;
 import org.eclipse.xtext.ui.shared.Access;

 

 import com.google.common.collect.Lists;

-import com.google.inject.internal.Maps;

 

 public class EditingDomainAdapter extends AdapterImpl implements ResourceSetListener,

 		TransactionalEditingDomainListener {

@@ -85,7 +85,7 @@ public class EditingDomainAdapter extends AdapterImpl implements ResourceSetList
 		this.editingDomain = editingDomain;

 		editingDomain.addResourceSetListener(this);

 		dirtyStateManager = Access.getIDirtyStateManager().get();

-		uri2dirtyResource = Maps.newHashMap();

+		uri2dirtyResource = new HashMap<URI, IDirtyResource>();

 		Lifecycle lifecycle = TransactionUtil.getAdapter(editingDomain, Lifecycle.class);

 		lifecycle.addTransactionalEditingDomainListener(this);

 	}

diff --git a/releng/org.eclipse.etrice.releng/buckminster.cspec b/releng/org.eclipse.etrice.releng/buckminster.cspec
index ec7a5fe80..f7a4e0438 100644
--- a/releng/org.eclipse.etrice.releng/buckminster.cspec
+++ b/releng/org.eclipse.etrice.releng/buckminster.cspec
@@ -5,12 +5,13 @@
         <cs:dependency name="org.eclipse.draw2d" componentType="eclipse.feature"/>

         <cs:dependency name="org.eclipse.etrice.core.feature" componentType="eclipse.feature"/>

         <cs:dependency name="org.eclipse.etrice.examples.feature" componentType="eclipse.feature"/>

+        <cs:dependency name="org.eclipse.etrice.runtime.java" componentType="buckminster"/>

         <cs:dependency name="org.eclipse.etrice.site" componentType="eclipse.feature"/>

         <cs:dependency name="org.eclipse.pde" componentType="eclipse.feature"/>

         <cs:dependency name="org.eclipse.pde.source" componentType="eclipse.feature"/>

         <cs:dependency name="org.eclipse.platform" componentType="eclipse.feature"/>

         <cs:dependency name="org.eclipse.platform.source" componentType="eclipse.feature"/>

-        <cs:dependency name="org.eclipse.etrice.runtime.java" componentType="buckminster"/>

+        <cs:dependency name="org.aopalliance" componentType="osgi.bundle"/>

     </cs:dependencies>

     <cs:actions>

         <cs:public name="copy.sites" actor="ant">

diff --git a/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/debugging/MSCFilter.java b/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/debugging/MSCFilter.java
index 9abdd2013..f3ab2358d 100644
--- a/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/debugging/MSCFilter.java
+++ b/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/debugging/MSCFilter.java
@@ -35,7 +35,8 @@ public class MSCFilter {
 		if (filterList.isEmpty())

 			return true; // no filters -> all messages will be logged

 		for (FilterItem item : filterList){

-			if (text.startsWith(item.filter)) return true;

+			if (text.startsWith(item.filter))

+				return !item.exclude;

 		}

 		return false;

 	}

diff --git a/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/messaging/RTSystemServicesProtocol.java b/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/messaging/RTSystemServicesProtocol.java
index bcce85979..57b229b3b 100644
--- a/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/messaging/RTSystemServicesProtocol.java
+++ b/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/messaging/RTSystemServicesProtocol.java
@@ -2,11 +2,11 @@ package org.eclipse.etrice.runtime.java.messaging;
 

 import java.util.ArrayList;

 

-import org.eclipse.etrice.runtime.java.messaging.Address;

-import org.eclipse.etrice.runtime.java.messaging.Message;

-import org.eclipse.etrice.runtime.java.messaging.IMessageReceiver;

-import org.eclipse.etrice.runtime.java.modelbase.*;

 import org.eclipse.etrice.runtime.java.debugging.DebuggingService;

+import org.eclipse.etrice.runtime.java.modelbase.EventMessage;

+import org.eclipse.etrice.runtime.java.modelbase.EventWithDataMessage;

+import org.eclipse.etrice.runtime.java.modelbase.IEventReceiver;

+import org.eclipse.etrice.runtime.java.modelbase.PortBase;

 

 public class RTSystemServicesProtocol {

 	// message IDs

diff --git a/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/modelbase/ActorClassBase.java b/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/modelbase/ActorClassBase.java
index faa9f3548..ad67fc2c0 100644
--- a/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/modelbase/ActorClassBase.java
+++ b/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/modelbase/ActorClassBase.java
@@ -42,8 +42,7 @@ public abstract class ActorClassBase extends EventReceiver implements IMessageRe
 

 	private MessageService ownMsgsvc = null;

 	private Address ownAddr = null;

-	// the System Port

-	private RTSystemServicesProtocolPort RTSystemPort = null;

+	protected RTSystemServicesProtocolPort RTSystemPort = null;

 	

 	public ActorClassBase(IRTObject parent, String name, Address ownAddr, Address systemPortPeerAddr) {

 		super(parent, name);

diff --git a/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/modelbase/PortBase.java b/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/modelbase/PortBase.java
index 9a4989b87..d23f23035 100644
--- a/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/modelbase/PortBase.java
+++ b/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/modelbase/PortBase.java
@@ -9,7 +9,6 @@
 package org.eclipse.etrice.runtime.java.modelbase;

 

 import org.eclipse.etrice.runtime.java.messaging.Address;

-import org.eclipse.etrice.runtime.java.messaging.IMessageReceiver;

 

 /**

  * An abstract base class for port instances.

diff --git a/tests/org.eclipse.etrice.integration.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.etrice.integration.tests/.settings/org.eclipse.jdt.core.prefs
index e21c83faa..271c85e31 100644
--- a/tests/org.eclipse.etrice.integration.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.etrice.integration.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Fri Sep 17 19:48:42 CEST 2010

+#Mon Sep 19 09:34:24 CEST 2011

 eclipse.preferences.version=1

 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

@@ -7,6 +7,75 @@ org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate

 org.eclipse.jdt.core.compiler.debug.localVariable=generate

 org.eclipse.jdt.core.compiler.debug.sourceFile=generate

+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning

 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore

+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning

+org.eclipse.jdt.core.compiler.problem.deadCode=warning

+org.eclipse.jdt.core.compiler.problem.deprecation=warning

+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled

+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning

+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore

 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore

+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled

+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore

+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning

+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning

+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error

+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning

+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled

+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning

+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore

+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore

+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore

+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning

+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore

+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore

+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore

+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled

+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore

+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning

+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning

+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore

+org.eclipse.jdt.core.compiler.problem.nullReference=warning

+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning

+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore

+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore

+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore

+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning

+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore

+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore

+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore

+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore

+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled

+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning

+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled

+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled

+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore

+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning

+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled

+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning

+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning

+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore

+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore

+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled

+org.eclipse.jdt.core.compiler.problem.unusedImport=ignore

+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning

+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore

+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled

+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled

+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning

+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

 org.eclipse.jdt.core.compiler.source=1.6

diff --git a/tests/org.eclipse.etrice.runtime.java.tests/.classpath b/tests/org.eclipse.etrice.runtime.java.tests/.classpath
index d276b859a..1378d071f 100644
--- a/tests/org.eclipse.etrice.runtime.java.tests/.classpath
+++ b/tests/org.eclipse.etrice.runtime.java.tests/.classpath
@@ -3,6 +3,6 @@
 	<classpathentry kind="src" path="src"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.etrice.runtime.java"/>

-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>

+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/PortBaseTest.java b/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/PortBaseTest.java
index aff2e6bff..0c4993802 100644
--- a/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/PortBaseTest.java
+++ b/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/modelbase/PortBaseTest.java
@@ -8,19 +8,13 @@
 

 package org.eclipse.etrice.runtime.java.modelbase;

 

+import junit.framework.TestCase;

+

 import org.eclipse.etrice.runtime.java.messaging.Address;

-import org.eclipse.etrice.runtime.java.messaging.IMessageReceiver;

 import org.eclipse.etrice.runtime.java.messaging.IRTObject;

 import org.eclipse.etrice.runtime.java.messaging.Message;

 import org.eclipse.etrice.runtime.java.messaging.MessageService;

 import org.eclipse.etrice.runtime.java.messaging.RTServices;

-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;

-import org.eclipse.etrice.runtime.java.modelbase.IEventReceiver;

-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;

-import org.eclipse.etrice.runtime.java.modelbase.PortBase;

-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBaseTest.MockRTObject;

-

-import junit.framework.TestCase;

 

 public class PortBaseTest extends TestCase {

 	// TODO: pull out all Mock Objects