removed JVmModelInferrer

ignore warnings for non public API usages

5 files changed, 77 insertions, 88 deletions

diff --git a/org.eclipse.emf.ecore.xcore/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.emf.ecore.xcore/.settings/org.eclipse.jdt.core.prefs
index a4df1b1..b527ed3 100644
--- a/org.eclipse.emf.ecore.xcore/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.emf.ecore.xcore/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,83 @@
-#Thu Aug 04 09:46:00 CEST 2011
+#Thu Aug 04 11:58:36 CEST 2011
 eclipse.preferences.version=1
 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
 org.eclipse.jdt.core.compiler.compliance=1.5
+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=ignore
+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=warning
+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.5
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/org.eclipse.emf.ecore.xcore/src-gen/org/eclipse/emf/ecore/xcore/AbstractXcoreRuntimeModule.java b/org.eclipse.emf.ecore.xcore/src-gen/org/eclipse/emf/ecore/xcore/AbstractXcoreRuntimeModule.java
index 8435c3b..b46cf2c 100644
--- a/org.eclipse.emf.ecore.xcore/src-gen/org/eclipse/emf/ecore/xcore/AbstractXcoreRuntimeModule.java
+++ b/org.eclipse.emf.ecore.xcore/src-gen/org/eclipse/emf/ecore/xcore/AbstractXcoreRuntimeModule.java
@@ -229,9 +229,4 @@ public abstract class AbstractXcoreRuntimeModule extends DefaultRuntimeModule {
 		return org.eclipse.xtext.xbase.jvmmodel.JvmGlobalScopeProvider.class;
 	}
 
-	// contributed by org.eclipse.xtext.generator.xbase.XbaseGeneratorFragment
-	public Class<? extends org.eclipse.xtext.xbase.jvmmodel.IJvmModelInferrer> bindIJvmModelInferrer() {
-		return org.eclipse.emf.ecore.xcore.jvmmodel.XcoreJvmModelInferrer.class;
-	}
-
 }
diff --git a/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/GenerateXcore.mwe2 b/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/GenerateXcore.mwe2
index 393e8f2..d9ce5e3 100644
--- a/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/GenerateXcore.mwe2
+++ b/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/GenerateXcore.mwe2
@@ -124,7 +124,9 @@ Workflow {
 			
 			// Xbase support
 			fragment = types.TypesGeneratorFragment {}
-			fragment = xbase.XbaseGeneratorFragment {}
+			fragment = xbase.XbaseGeneratorFragment {
+				generateXtendInferrer = false
+			}
 		}
 	}
 }
diff --git a/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/jvmmodel/XcoreJvmModelInferrer.xtend b/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/jvmmodel/XcoreJvmModelInferrer.xtend
deleted file mode 100755
index 5823589..0000000
--- a/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/jvmmodel/XcoreJvmModelInferrer.xtend
+++ b/dev/null
@@ -1,40 +0,0 @@
-package org.eclipse.emf.ecore.xcore.jvmmodel
- 
-import org.eclipse.xtext.xbase.jvmmodel.IJvmModelInferrer
-import org.eclipse.xtext.xbase.jvmmodel.IJvmModelAssociator
-import org.eclipse.xtext.common.types.JvmDeclaredType
-import org.eclipse.emf.ecore.EObject
-import java.util.List
-import com.google.inject.Inject
-import org.eclipse.emf.ecore.EPackage
-import org.eclipse.emf.ecore.EGenericType
-import org.eclipse.emf.ecore.xcore.XPackage
-import org.eclipse.emf.ecore.xcore.util.XcoreJvmInferrer
-
-/**
- * <p>Infers a JVM model from the source model.</p> 
- *
- * <p>The JVM model should contain all elements that would appear in the Java code 
- * which is generated from the source model. 
- * Other Xtend models link against the JVM model rather than the source model. The JVM
- * model elements should be associated with their source element by means of the
- * {@link IJvmModelAssociator}.</p>     
- */
-class XcoreJvmModelInferrer implements IJvmModelInferrer {
-
-	@Inject 
-	IJvmModelAssociator jvmModelAssociator
-
-/*
-   	override List<? extends JvmDeclaredType> inferJvmModel(EObject sourceObject) {
-   		return newArrayList();
-   	}
-*/
-   	
-   	def dispatch List<? extends JvmDeclaredType> inferJvmModel(EObject sourceObject) {
-   		return newArrayList();
-   	}
-   	def dispatch List<? extends JvmDeclaredType> inferJvmModel(XPackage xPackage) {
-   		return new XcoreJvmInferrer().getDeclaredTypes(xPackage);
-   	}
-}
diff --git a/org.eclipse.emf.ecore.xcore/xtend-gen/org/eclipse/emf/ecore/xcore/jvmmodel/XcoreJvmModelInferrer.java b/org.eclipse.emf.ecore.xcore/xtend-gen/org/eclipse/emf/ecore/xcore/jvmmodel/XcoreJvmModelInferrer.java
deleted file mode 100755
index 05f2e54..0000000
--- a/org.eclipse.emf.ecore.xcore/xtend-gen/org/eclipse/emf/ecore/xcore/jvmmodel/XcoreJvmModelInferrer.java
+++ b/dev/null
@@ -1,41 +0,0 @@
-package org.eclipse.emf.ecore.xcore.jvmmodel;
-
-import com.google.inject.Inject;
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.xcore.XPackage;
-import org.eclipse.emf.ecore.xcore.util.XcoreJvmInferrer;
-import org.eclipse.xtext.common.types.JvmDeclaredType;
-import org.eclipse.xtext.xbase.jvmmodel.IJvmModelAssociator;
-import org.eclipse.xtext.xbase.jvmmodel.IJvmModelInferrer;
-import org.eclipse.xtext.xbase.lib.CollectionLiterals;
-
-@SuppressWarnings("all")
-public class XcoreJvmModelInferrer implements IJvmModelInferrer {
-  
-  @Inject
-  private IJvmModelAssociator jvmModelAssociator;
-  
-  protected List<? extends JvmDeclaredType> _inferJvmModel(final EObject sourceObject) {
-    ArrayList<JvmDeclaredType> _newArrayList = CollectionLiterals.<JvmDeclaredType>newArrayList();
-    return _newArrayList;
-  }
-  
-  protected List<? extends JvmDeclaredType> _inferJvmModel(final XPackage xPackage) {
-    XcoreJvmInferrer _xcoreJvmInferrer = new XcoreJvmInferrer();
-    List<? extends JvmDeclaredType> _declaredTypes = _xcoreJvmInferrer.getDeclaredTypes(xPackage);
-    return _declaredTypes;
-  }
-  
-  public List<? extends JvmDeclaredType> inferJvmModel(final EObject xPackage) {
-    if ((xPackage instanceof XPackage)) {
-      return _inferJvmModel((XPackage)xPackage);
-    } else if ((xPackage instanceof EObject)) {
-      return _inferJvmModel((EObject)xPackage);
-    } else {
-      throw new IllegalArgumentException("Unhandled parameter types: " +
-        java.util.Arrays.<Object>asList(xPackage).toString());
-    }
-  }
-}
\ No newline at end of file