diff options
4 files changed, 41 insertions, 138 deletions
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/util/ProjectCreationHelper.java b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/util/ProjectCreationHelper.java index fdc6bb081d..90a78b586f 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/util/ProjectCreationHelper.java +++ b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/util/ProjectCreationHelper.java @@ -58,19 +58,7 @@ public class ProjectCreationHelper public IProject createProject() throws CoreException { IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name); - // List<IClasspathEntry> classpathEntries = new ArrayList<IClasspathEntry>(); - - // if (project.exists()) - // { - // try - // { - // project.delete(true, null); - // } - // catch (Exception e) - // { - // System.out.println("Project could not be deleted!!!"); - // } - // } + if (!project.exists()) { project.create(null); @@ -175,10 +163,7 @@ public class ProjectCreationHelper newEntries.add(classpathEntry); } } - // IClasspathEntry[] newEntries = new IClasspathEntry[oldEntries.length + 1]; - // System.arraycopy(oldEntries, 0, newEntries, 0, oldEntries.length); - // newEntries[oldEntries.length] = newEntry; IClasspathEntry[] newEntriesArray = new IClasspathEntry[newEntries.size()]; javaProject.setRawClasspath(newEntries.toArray(newEntriesArray), null); } diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/views/DawnItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/views/DawnItemProvider.java index e1a6e42437..37e610af93 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/views/DawnItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/views/DawnItemProvider.java @@ -38,7 +38,6 @@ public class DawnItemProvider extends CDOItemProvider @Override public Object[] getChildren(Object element) { - System.out.println(element); // if (element instanceof CDOView) // { // return ((CDOView)element).getRootResource().getContents().toArray(); @@ -66,7 +65,7 @@ public class DawnItemProvider extends CDOItemProvider if (obj instanceof CDOResource) { - CDOResource resource = ((CDOResource)obj); + CDOResource resource = (CDOResource)obj; Image img = EditorDescriptionHelper.getImageForEditor(resource.getName()); if (img != null) { diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewResourceWizardPage.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewResourceWizardPage.java index c654f0ce73..d6f435bd89 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewResourceWizardPage.java +++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewResourceWizardPage.java @@ -225,7 +225,6 @@ public class DawnCreateNewResourceWizardPage extends WizardPage private void validatePage() { boolean valid = false; - System.out.println(resourceText.getText()); if (resourceText.getText().length() != 0) { setPageComplete(true); diff --git a/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/DawnResourceHelper.java b/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/DawnResourceHelper.java index ceb7217e31..4c75e8d1a3 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/DawnResourceHelper.java +++ b/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/DawnResourceHelper.java @@ -843,14 +843,6 @@ public class DawnResourceHelper } } - public static void printResourceSysout(Resource r) - { - for (EObject o : r.getContents()) - { - printEObjectFullSysout(o, 0); - } - } - public static void printEObject(EObject o, int level) { for (Object child : o.eContents()) @@ -861,74 +853,72 @@ public class DawnResourceHelper public static void printEObjectFull(EObject o, int level) { - System.out.println(tabs(level) + "--------------------------------------------"); - System.out.println(tabs(level) + "Object: " + o); - System.out.println(tabs(level) + "o.eContainer: " + o.eContainer()); - System.out.println(tabs(level) + "o.eContainingFeature: " + o.eContainingFeature()); - System.out.println(tabs(level) + "o.eContainmentFeature: " + o.eContainmentFeature()); - System.out.println(tabs(level) + "o.eIsProxy: " + o.eIsProxy()); - System.out.println(tabs(level) + "o.eResource: " + o.eResource()); - System.out.println(tabs(level) + "o.getClass: " + o.getClass()); - System.out.println(tabs(level) + "o.eClass: " + o.eClass()); - System.out.println(tabs(level) + "o.eCrossReferences: " + o.eCrossReferences()); - - System.out.println(tabs(level) + "o.eClass.getClassifierID: " + o.eClass().getClassifierID()); - System.out.println(tabs(level) + "o.eClass.getFeatureCount: " + o.eClass().getFeatureCount()); - System.out.println(tabs(level) + "o.eClass.getInstanceClassName: " + o.eClass().getInstanceClassName()); - System.out.println(tabs(level) + "o.eClass.getInstanceTypeName: " + o.eClass().getInstanceTypeName()); - System.out.println(tabs(level) + "o.eClass.getName: " + o.eClass().getName()); - System.out.println(tabs(level) + "o.eClass.getDefaultValue: " + o.eClass().getDefaultValue()); - System.out.println(tabs(level) + "o.eClass.getEPackage: " + o.eClass().getEPackage()); - System.out.println(tabs(level) + "o.eClass.getEIDAttribute: " + o.eClass().getEIDAttribute()); - System.out.println(tabs(level) + "o.eClass.getInstanceClass: " + o.eClass().getInstanceClass()); + print(tabs(level) + "--------------------------------------------"); + print(tabs(level) + "Object: " + o); + print(tabs(level) + "o.eContainer: " + o.eContainer()); + print(tabs(level) + "o.eContainingFeature: " + o.eContainingFeature()); + print(tabs(level) + "o.eContainmentFeature: " + o.eContainmentFeature()); + print(tabs(level) + "o.eIsProxy: " + o.eIsProxy()); + print(tabs(level) + "o.eResource: " + o.eResource()); + print(tabs(level) + "o.getClass: " + o.getClass()); + print(tabs(level) + "o.eClass: " + o.eClass()); + print(tabs(level) + "o.eCrossReferences: " + o.eCrossReferences()); + + print(tabs(level) + "o.eClass.getClassifierID: " + o.eClass().getClassifierID()); + print(tabs(level) + "o.eClass.getFeatureCount: " + o.eClass().getFeatureCount()); + print(tabs(level) + "o.eClass.getInstanceClassName: " + o.eClass().getInstanceClassName()); + print(tabs(level) + "o.eClass.getInstanceTypeName: " + o.eClass().getInstanceTypeName()); + print(tabs(level) + "o.eClass.getName: " + o.eClass().getName()); + print(tabs(level) + "o.eClass.getDefaultValue: " + o.eClass().getDefaultValue()); + print(tabs(level) + "o.eClass.getEPackage: " + o.eClass().getEPackage()); + print(tabs(level) + "o.eClass.getEIDAttribute: " + o.eClass().getEIDAttribute()); + print(tabs(level) + "o.eClass.getInstanceClass: " + o.eClass().getInstanceClass()); for (EAttribute attribute : o.eClass().getEAllAttributes()) { - System.out.println(tabs(level + 1) + "o.eClass.getEAllAttributes.attribute: '" + attribute.getName() + "': " + print(tabs(level + 1) + "o.eClass.getEAllAttributes.attribute: '" + attribute.getName() + "': " + o.eGet(attribute)); } for (EAnnotation annotation : o.eClass().getEAnnotations()) { - System.out.println(tabs(level + 1) + "o.eClass().getEAnnotations().annotation: '" + annotation); + print(tabs(level + 1) + "o.eClass().getEAnnotations().annotation: '" + annotation); } for (EReference containment : o.eClass().getEAllContainments()) { - System.out.println(tabs(level + 1) + "o.eClass().getEAllContainments().containment: '" + containment); + print(tabs(level + 1) + "o.eClass().getEAllContainments().containment: '" + containment); } for (EGenericType genericSupertype : o.eClass().getEAllGenericSuperTypes()) { - System.out.println(tabs(level + 1) + "o.eClass().getEAllGenericSuperTypes().genericSupertype: '" - + genericSupertype); + print(tabs(level + 1) + "o.eClass().getEAllGenericSuperTypes().genericSupertype: '" + genericSupertype); } for (EOperation operation : o.eClass().getEAllOperations()) { - System.out.println(tabs(level + 1) + "o.eClass().getEAllOperations().operation: '" + operation); + print(tabs(level + 1) + "o.eClass().getEAllOperations().operation: '" + operation); } for (EReference reference : o.eClass().getEAllReferences()) { - System.out.println(tabs(level + 1) + "o.eClass().getEAllReferences().reference: '" + reference); + print(tabs(level + 1) + "o.eClass().getEAllReferences().reference: '" + reference); } for (EClass supertype : o.eClass().getEAllSuperTypes()) { - System.out.println(tabs(level + 1) + "o.eClass().getEAllSuperTypes().supertype: '" + supertype); + print(tabs(level + 1) + "o.eClass().getEAllSuperTypes().supertype: '" + supertype); } for (EStructuralFeature structuralFeature : o.eClass().getEAllStructuralFeatures()) { - System.out.println(tabs(level + 1) + "o.eClass().getEAllStructuralFeatures().structuralFeature: '" - + structuralFeature); + print(tabs(level + 1) + "o.eClass().getEAllStructuralFeatures().structuralFeature: '" + structuralFeature); } for (EAnnotation annotation : o.eClass().getEAnnotations()) { - System.out.println(tabs(level + 1) + "o.eClass().getEAnnotations().annotation: '" + annotation); + print(tabs(level + 1) + "o.eClass().getEAnnotations().annotation: '" + annotation); } for (EAttribute attribute : o.eClass().getEAttributes()) { - System.out.println(tabs(level + 1) + "o.eClass().getEAttributes().annotation: '" + attribute); + print(tabs(level + 1) + "o.eClass().getEAttributes().annotation: '" + attribute); } for (Adapter adapter : o.eClass().eAdapters()) { - System.out.println(tabs(level + 1) + "o.eClass().eAdapters().adapter: '" + adapter); + print(tabs(level + 1) + "o.eClass().eAdapters().adapter: '" + adapter); } for (Object child : o.eContents()) @@ -937,84 +927,6 @@ public class DawnResourceHelper } } - public static void printEObjectFullSysout(EObject o, int level) - { - System.out.println(tabs(level) + "--------------------------------------------"); - System.out.println(tabs(level) + "Object: " + o); - System.out.println(tabs(level) + "o.eContainer: " + o.eContainer()); - System.out.println(tabs(level) + "o.eContainingFeature: " + o.eContainingFeature()); - System.out.println(tabs(level) + "o.eContainmentFeature: " + o.eContainmentFeature()); - System.out.println(tabs(level) + "o.eIsProxy: " + o.eIsProxy()); - System.out.println(tabs(level) + "o.eResource: " + o.eResource()); - System.out.println(tabs(level) + "o.getClass: " + o.getClass()); - System.out.println(tabs(level) + "o.eClass: " + o.eClass()); - System.out.println(tabs(level) + "o.eCrossReferences: " + o.eCrossReferences()); - - System.out.println(tabs(level) + "o.eClass.getClassifierID: " + o.eClass().getClassifierID()); - System.out.println(tabs(level) + "o.eClass.getFeatureCount: " + o.eClass().getFeatureCount()); - System.out.println(tabs(level) + "o.eClass.getInstanceClassName: " + o.eClass().getInstanceClassName()); - System.out.println(tabs(level) + "o.eClass.getInstanceTypeName: " + o.eClass().getInstanceTypeName()); - System.out.println(tabs(level) + "o.eClass.getName: " + o.eClass().getName()); - System.out.println(tabs(level) + "o.eClass.getDefaultValue: " + o.eClass().getDefaultValue()); - System.out.println(tabs(level) + "o.eClass.getEPackage: " + o.eClass().getEPackage()); - System.out.println(tabs(level) + "o.eClass.getEIDAttribute: " + o.eClass().getEIDAttribute()); - System.out.println(tabs(level) + "o.eClass.getInstanceClass: " + o.eClass().getInstanceClass()); - - for (EAttribute attribute : o.eClass().getEAllAttributes()) - { - System.out.println(tabs(level + 1) + "o.eClass.getEAllAttributes.attribute: '" + attribute.getName() + "': " - + o.eGet(attribute)); - } - for (EAnnotation annotation : o.eClass().getEAnnotations()) - { - System.out.println(tabs(level + 1) + "o.eClass().getEAnnotations().annotation: '" + annotation); - } - for (EReference containment : o.eClass().getEAllContainments()) - { - System.out.println(tabs(level + 1) + "o.eClass().getEAllContainments().containment: '" + containment); - } - for (EGenericType genericSupertype : o.eClass().getEAllGenericSuperTypes()) - { - System.out.println(tabs(level + 1) + "o.eClass().getEAllGenericSuperTypes().genericSupertype: '" - + genericSupertype); - } - for (EOperation operation : o.eClass().getEAllOperations()) - { - System.out.println(tabs(level + 1) + "o.eClass().getEAllOperations().operation: '" + operation); - } - - for (EReference reference : o.eClass().getEAllReferences()) - { - System.out.println(tabs(level + 1) + "o.eClass().getEAllReferences().reference: '" + reference); - } - for (EClass supertype : o.eClass().getEAllSuperTypes()) - { - System.out.println(tabs(level + 1) + "o.eClass().getEAllSuperTypes().supertype: '" + supertype); - } - for (EStructuralFeature structuralFeature : o.eClass().getEAllStructuralFeatures()) - { - System.out.println(tabs(level + 1) + "o.eClass().getEAllStructuralFeatures().structuralFeature: '" - + structuralFeature); - } - for (EAnnotation annotation : o.eClass().getEAnnotations()) - { - System.out.println(tabs(level + 1) + "o.eClass().getEAnnotations().annotation: '" + annotation); - } - for (EAttribute attribute : o.eClass().getEAttributes()) - { - System.out.println(tabs(level + 1) + "o.eClass().getEAttributes().annotation: '" + attribute); - } - for (Adapter adapter : o.eClass().eAdapters()) - { - System.out.println(tabs(level + 1) + "o.eClass().eAdapters().adapter: '" + adapter); - } - - for (Object child : o.eContents()) - { - printEObjectFullSysout((EObject)child, level + 2); - } - } - private static String tabs(int level) { String s = ""; @@ -1061,4 +973,12 @@ public class DawnResourceHelper } return null; } + + protected static void print(String s) + { + if (TRACER.isEnabled()) + { + TRACER.trace(s); + } + } } |