diff options
Diffstat (limited to 'jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature')
8 files changed, 21 insertions, 28 deletions
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddJPAEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddJPAEntityFeature.java index 377e9ef137..38cf22e304 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddJPAEntityFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddJPAEntityFeature.java @@ -49,6 +49,7 @@ import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; +import org.eclipse.jpt.jpadiagrameditor.ui.internal.JPADiagramEditorPlugin; import org.eclipse.jpt.jpadiagrameditor.ui.internal.i18n.JPAEditorMessages; import org.eclipse.jpt.jpadiagrameditor.ui.internal.modelintegration.util.ModelIntegrationUtil; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IAddEntityContext; @@ -182,7 +183,7 @@ public class AddJPAEntityFeature extends AbstractAddShapeFeature { packageName = getMappedSuperclassPackageDeclaration(fp, jpt, packageName); } catch (JavaModelException e) { - e.printStackTrace(); + JPADiagramEditorPlugin.logError(e); } boolean hasPrimaryKey = hasMappedSuperclassPrimaryKeyAttribute(jpt); @@ -421,9 +422,8 @@ public class AddJPAEntityFeature extends AbstractAddShapeFeature { if (cu.hasUnsavedChanges()) { headerTextString = "* " + headerTextString; //$NON-NLS-1$ } - } catch (JavaModelException e) { - System.err.println("Cannot check compilation unit for unsaved changes"); //$NON-NLS-1$ - e.printStackTrace(); + } catch (JavaModelException e) { + JPADiagramEditorPlugin.logError("Cannot check compilation unit for unsaved changes", e); //$NON-NLS-1$ } Text headerTextObj = Graphiti.getGaService().createDefaultText(getDiagram(), headerRect, headerTextString); diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickAddAttributeButtonFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickAddAttributeButtonFeature.java index fd885261f6..c8779ccdda 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickAddAttributeButtonFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickAddAttributeButtonFeature.java @@ -23,6 +23,7 @@ import org.eclipse.graphiti.mm.pictograms.ContainerShape; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; +import org.eclipse.jpt.jpadiagrameditor.ui.internal.JPADiagramEditorPlugin; import org.eclipse.jpt.jpadiagrameditor.ui.internal.i18n.JPAEditorMessages; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider; import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.JpaArtifactFactory; @@ -61,8 +62,7 @@ public class ClickAddAttributeButtonFeature extends AbstractCreateFeature { try { Thread.sleep(200); } catch (InterruptedException e) { - System.err.println("Thread sleep interrupted"); //$NON-NLS-1$ - e.printStackTrace(); + JPADiagramEditorPlugin.logError("Thread sleep interrupted", e); //$NON-NLS-1$ } } cnt++; diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateJPAEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateJPAEntityFeature.java index 09eb969464..8150e71677 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateJPAEntityFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateJPAEntityFeature.java @@ -135,16 +135,14 @@ public class CreateJPAEntityFeature extends AbstractCreateFeature { try { this.getFeatureProvider().getJPAEditorUtil().createEntityInProject(targetProject, entityName, jpaPreferenceStore, isMappedSuperclassChild, mappedSuperclassName, mappedSuperclassPackage, hasPrimarykey); } catch (Exception e1) { - System.err.println("Cannot create an entity in the project " + targetProject.getName()); //$NON-NLS-1$ - e1.printStackTrace(); + JPADiagramEditorPlugin.logError("Cannot create an entity in the project " + targetProject.getName(), e1); //$NON-NLS-1$ } try { jpaProject.getProject().refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); } catch (CoreException e1) { - System.err.println("Cannot refresh the project"); //$NON-NLS-1$ - e1.printStackTrace(); + JPADiagramEditorPlugin.logError("Cannot refresh the project", e1); //$NON-NLS-1$ } ListIterator<PersistenceUnit> lit = jpaProject.getRootContextNode().getPersistenceXml().getPersistence().persistenceUnits(); @@ -156,8 +154,7 @@ public class CreateJPAEntityFeature extends AbstractCreateFeature { try { Thread.sleep(200); } catch (InterruptedException e) { - System.err.println("Thread sleep interrupted"); //$NON-NLS-1$ - e.printStackTrace(); + JPADiagramEditorPlugin.logError("Thread sleep interrupted", e); //$NON-NLS-1$ } jpt = (JavaPersistentType)pu.getPersistentType(entityName); cnt++; @@ -170,9 +167,7 @@ public class CreateJPAEntityFeature extends AbstractCreateFeature { getFeatureProvider().getJPAEditorUtil().formatCode(cu, ws); return new Object[] { jpt }; } else { - System.err.println("The JPA entity " + entityName + " could not be created"); //$NON-NLS-1$ //$NON-NLS-2$ - Exception e = new Exception(); - e.printStackTrace(); + JPADiagramEditorPlugin.logError("The JPA entity " + entityName + " could not be created", new Exception()); //$NON-NLS-1$ //$NON-NLS-2$ } return new Object[] {}; } @@ -202,7 +197,7 @@ public class CreateJPAEntityFeature extends AbstractCreateFeature { } } catch (IOException e) { - e.printStackTrace(); + JPADiagramEditorPlugin.logError(e); } return false; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateJPAEntityFromMappedSuperclassFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateJPAEntityFromMappedSuperclassFeature.java index 15f7b60f63..620654b971 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateJPAEntityFromMappedSuperclassFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateJPAEntityFromMappedSuperclassFeature.java @@ -73,9 +73,7 @@ public class CreateJPAEntityFromMappedSuperclassFeature extends .createEntityFromMappedSuperclassInProject(targetProject, mappedSuperclassName, jpaPreferenceStore); } catch (Exception e1) { - System.err - .println("Cannot create an entity in the project " + targetProject.getName()); //$NON-NLS-1$ - e1.printStackTrace(); + JPADiagramEditorPlugin.logError("Cannot create an entity in the project " + targetProject.getName(), e1); //$NON-NLS-1$ } CreateJPAEntityFeature createEntityFeature = new CreateJPAEntityFeature( diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/OpenJPADetailsViewFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/OpenJPADetailsViewFeature.java index 19f73c52d5..60115a845b 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/OpenJPADetailsViewFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/OpenJPADetailsViewFeature.java @@ -18,6 +18,7 @@ package org.eclipse.jpt.jpadiagrameditor.ui.internal.feature; import org.eclipse.graphiti.features.IFeatureProvider; import org.eclipse.graphiti.features.context.ICustomContext; import org.eclipse.graphiti.features.custom.AbstractCustomFeature; +import org.eclipse.jpt.jpadiagrameditor.ui.internal.JPADiagramEditorPlugin; import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.JPAEditorConstants; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; @@ -38,8 +39,7 @@ public class OpenJPADetailsViewFeature extends AbstractCustomFeature { PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(). showView(JPAEditorConstants.ID_VIEW_JPA_DETAILS); } catch (PartInitException e) { - System.err.println("Can't open JPA Details view"); //$NON-NLS-1$ - e.printStackTrace(); + JPADiagramEditorPlugin.logError("Can't open JPA Details view", e); //$NON-NLS-1$ } } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/OpenMiniatureViewFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/OpenMiniatureViewFeature.java index a6b86e5492..d700c8be17 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/OpenMiniatureViewFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/OpenMiniatureViewFeature.java @@ -18,6 +18,7 @@ package org.eclipse.jpt.jpadiagrameditor.ui.internal.feature; import org.eclipse.graphiti.features.IFeatureProvider; import org.eclipse.graphiti.features.context.ICustomContext; import org.eclipse.graphiti.features.custom.AbstractCustomFeature; +import org.eclipse.jpt.jpadiagrameditor.ui.internal.JPADiagramEditorPlugin; import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.JPAEditorConstants; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; @@ -38,8 +39,7 @@ public class OpenMiniatureViewFeature extends AbstractCustomFeature { PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(). showView(JPAEditorConstants.ID_VIEW_MINIATURE); } catch (PartInitException e) { - System.err.println("Can't open Miniature view"); //$NON-NLS-1$ - e.printStackTrace(); + JPADiagramEditorPlugin.logError("Can't open Miniature view", e); //$NON-NLS-1$ } } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RefactorEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RefactorEntityFeature.java index 729d88c7fc..f4a381d1e0 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RefactorEntityFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RefactorEntityFeature.java @@ -52,6 +52,7 @@ import org.eclipse.jpt.jpa.core.resource.java.Annotation; import org.eclipse.jpt.jpa.core.resource.java.JavaResourceCompilationUnit; import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.jpa.core.resource.java.OwnableRelationshipMappingAnnotation; +import org.eclipse.jpt.jpadiagrameditor.ui.internal.JPADiagramEditorPlugin; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.AddEntityContext; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider; import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.JPAEditorConstants; @@ -249,8 +250,7 @@ public abstract class RefactorEntityFeature extends AbstractCustomFeature { try { moved = s.tryAcquire(2, 4, TimeUnit.SECONDS); } catch (InterruptedException e) { - System.err.println("Thread interrupted"); //$NON-NLS-1$ - e.printStackTrace(); + JPADiagramEditorPlugin.logError("Thread interrupted", e); //$NON-NLS-1$ } } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveAttributeFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveAttributeFeature.java index 3e6f13d3b8..055d602afb 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveAttributeFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveAttributeFeature.java @@ -32,6 +32,7 @@ import org.eclipse.graphiti.mm.pictograms.ContainerShape; import org.eclipse.graphiti.mm.pictograms.PictogramElement; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; +import org.eclipse.jpt.jpadiagrameditor.ui.internal.JPADiagramEditorPlugin; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.JPAEditorFeatureProvider; import org.eclipse.jpt.jpadiagrameditor.ui.internal.relations.IRelation; @@ -79,8 +80,7 @@ public class RemoveAttributeFeature extends DefaultRemoveFeature { public void preRemove(IRemoveContext context) { final PictogramElement pe = context.getPictogramElement(); if (pe == null) { - System.err.println("PictogramElement is null\n"); //$NON-NLS-1$ - new Exception().printStackTrace(); + JPADiagramEditorPlugin.logError("PictogramElement is null\n", new Exception()); //$NON-NLS-1$ return; } IJPAEditorFeatureProvider fp = getFeatureProvider(); @@ -114,7 +114,7 @@ public class RemoveAttributeFeature extends DefaultRemoveFeature { try{ graphicalRemoveAttribute(entityShape); } catch (Exception e){ - e.printStackTrace(); + JPADiagramEditorPlugin.logError(e); } } |