[core.genmodel] bug fix

2 files changed, 133 insertions, 1 deletions

diff --git a/plugins/org.eclipse.etrice.core.genmodel/.settings/edu.umd.cs.findbugs.core.prefs b/plugins/org.eclipse.etrice.core.genmodel/.settings/edu.umd.cs.findbugs.core.prefs
new file mode 100644
index 000000000..a8786022b
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel/.settings/edu.umd.cs.findbugs.core.prefs
@@ -0,0 +1,132 @@
+#FindBugs User Preferences

+#Thu Nov 29 18:46:28 CET 2012

+cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud

+detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true

+detectorAtomicityProblem=AtomicityProblem|true

+detectorBadAppletConstructor=BadAppletConstructor|false

+detectorBadResultSetAccess=BadResultSetAccess|true

+detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true

+detectorBadUseOfReturnValue=BadUseOfReturnValue|true

+detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true

+detectorBooleanReturnNull=BooleanReturnNull|true

+detectorCallToUnsupportedMethod=CallToUnsupportedMethod|false

+detectorCheckExpectedWarnings=CheckExpectedWarnings|false

+detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true

+detectorCheckTypeQualifiers=CheckTypeQualifiers|true

+detectorCloneIdiom=CloneIdiom|true

+detectorComparatorIdiom=ComparatorIdiom|true

+detectorConfusedInheritance=ConfusedInheritance|true

+detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true

+detectorCrossSiteScripting=CrossSiteScripting|true

+detectorDefaultEncodingDetector=DefaultEncodingDetector|true

+detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true

+detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true

+detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true

+detectorDontUseEnum=DontUseEnum|true

+detectorDroppedException=DroppedException|true

+detectorDumbMethodInvocations=DumbMethodInvocations|true

+detectorDumbMethods=DumbMethods|true

+detectorDuplicateBranches=DuplicateBranches|true

+detectorEmptyZipFileEntry=EmptyZipFileEntry|true

+detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true

+detectorExplicitSerialization=ExplicitSerialization|true

+detectorFinalizerNullsFields=FinalizerNullsFields|true

+detectorFindBadCast2=FindBadCast2|true

+detectorFindBadForLoop=FindBadForLoop|true

+detectorFindCircularDependencies=FindCircularDependencies|false

+detectorFindDeadLocalStores=FindDeadLocalStores|true

+detectorFindDoubleCheck=FindDoubleCheck|true

+detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true

+detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true

+detectorFindFinalizeInvocations=FindFinalizeInvocations|true

+detectorFindFloatEquality=FindFloatEquality|true

+detectorFindHEmismatch=FindHEmismatch|true

+detectorFindInconsistentSync2=FindInconsistentSync2|true

+detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true

+detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true

+detectorFindMaskedFields=FindMaskedFields|true

+detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true

+detectorFindNakedNotify=FindNakedNotify|true

+detectorFindNonShortCircuit=FindNonShortCircuit|true

+detectorFindNullDeref=FindNullDeref|true

+detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true

+detectorFindOpenStream=FindOpenStream|true

+detectorFindPuzzlers=FindPuzzlers|true

+detectorFindRefComparison=FindRefComparison|true

+detectorFindReturnRef=FindReturnRef|true

+detectorFindRunInvocations=FindRunInvocations|true

+detectorFindSelfComparison=FindSelfComparison|true

+detectorFindSelfComparison2=FindSelfComparison2|true

+detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true

+detectorFindSpinLoop=FindSpinLoop|true

+detectorFindSqlInjection=FindSqlInjection|true

+detectorFindTwoLockWait=FindTwoLockWait|true

+detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true

+detectorFindUnconditionalWait=FindUnconditionalWait|true

+detectorFindUninitializedGet=FindUninitializedGet|true

+detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true

+detectorFindUnreleasedLock=FindUnreleasedLock|true

+detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true

+detectorFindUnsyncGet=FindUnsyncGet|true

+detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true

+detectorFindUselessControlFlow=FindUselessControlFlow|true

+detectorFormatStringChecker=FormatStringChecker|true

+detectorHugeSharedStringConstants=HugeSharedStringConstants|true

+detectorIDivResultCastToDouble=IDivResultCastToDouble|true

+detectorIncompatMask=IncompatMask|true

+detectorInconsistentAnnotations=InconsistentAnnotations|true

+detectorInefficientMemberAccess=InefficientMemberAccess|false

+detectorInefficientToArray=InefficientToArray|true

+detectorInfiniteLoop=InfiniteLoop|true

+detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true

+detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true

+detectorInitializationChain=InitializationChain|true

+detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true

+detectorInstantiateStaticClass=InstantiateStaticClass|true

+detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true

+detectorInvalidJUnitTest=InvalidJUnitTest|true

+detectorIteratorIdioms=IteratorIdioms|true

+detectorLazyInit=LazyInit|true

+detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true

+detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true

+detectorMethodReturnCheck=MethodReturnCheck|true

+detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true

+detectorMutableLock=MutableLock|true

+detectorMutableStaticFields=MutableStaticFields|true

+detectorNaming=Naming|true

+detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true

+detectorNumberConstructor=NumberConstructor|true

+detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true

+detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true

+detectorPublicSemaphores=PublicSemaphores|false

+detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true

+detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true

+detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true

+detectorRedundantInterfaces=RedundantInterfaces|true

+detectorRepeatedConditionals=RepeatedConditionals|true

+detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true

+detectorSerializableIdiom=SerializableIdiom|true

+detectorStartInConstructor=StartInConstructor|true

+detectorStaticCalendarDetector=StaticCalendarDetector|true

+detectorStringConcatenation=StringConcatenation|true

+detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true

+detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true

+detectorSwitchFallthrough=SwitchFallthrough|true

+detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true

+detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true

+detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true

+detectorURLProblems=URLProblems|true

+detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true

+detectorUnnecessaryMath=UnnecessaryMath|true

+detectorUnreadFields=UnreadFields|true

+detectorUselessSubclassMethod=UselessSubclassMethod|false

+detectorVarArgsProblems=VarArgsProblems|true

+detectorVolatileUsage=VolatileUsage|true

+detectorWaitInLoop=WaitInLoop|true

+detectorWrongMapIterator=WrongMapIterator|true

+detectorXMLFactoryBypass=XMLFactoryBypass|true

+detector_threshold=2

+effort=default

+filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,MT_CORRECTNESS,PERFORMANCE,STYLE|false|15

+filter_settings_neg=MALICIOUS_CODE,NOISE,I18N,SECURITY,EXPERIMENTAL|

+run_at_full_build=false

diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/RootImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/RootImpl.java
index 48d3c85c5..4819eea17 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/RootImpl.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/RootImpl.java
@@ -795,7 +795,7 @@ public class RootImpl extends EObjectImpl implements Root {
 	private void getOperationDataClasses(HashSet<DataClass> dataClasses, EList<? extends Operation> operations) {

 		for (Operation op : operations) {

 			if (op.getReturntype()!=null) {

-				DataClass dc = name2dc.get(op.getReturntype().getType());

+				DataClass dc = name2dc.get(op.getReturntype().getType().getName());

 				if (dc!=null)

 					dataClasses.add(dc);

 			}