Google Git
Sign in
eclipse/sourceediting/webtools.sourceediting/6360e2a2e1d5933b24343d2213b48974c6ca5d7f^!/.
commit
6360e2a2e1d5933b24343d2213b48974c6ca5d7f
[log]
author
kchong <kchong>
Mon Apr 03 23:50:23 2006 +0000
committer
kchong <kchong>
Mon Apr 03 23:50:23 2006 +0000
tree
efbf231390b89c72fead4a5bb8a2f6f596f39e09
parent
2d203b8bd2d6923f3b266f4221ce5c27d958e031 [diff]
[no bug] reorg classes to appropriate packages

diff --git a/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF
index 23de916..d03520d 100644
--- a/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF

@@ -23,8 +23,10 @@
  org.eclipse.wst.xsd.editor,
  org.eclipse.wst.xsd.editor.internal.actions,
  org.eclipse.wst.xsd.editor.internal.adapters,
+ org.eclipse.wst.xsd.editor.internal.commands,
  org.eclipse.wst.xsd.editor.internal.design.editparts,
  org.eclipse.wst.xsd.editor.internal.design.editparts.model,
+ org.eclipse.wst.xsd.editor.internal.design.editpolicies,
  org.eclipse.wst.xsd.editor.internal.design.figures,
  org.eclipse.wst.xsd.editor.internal.design.layouts,
  org.eclipse.wst.xsd.editor.internal.dialogs,

diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/adt/design/editpolicies/DragAndDropCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/commands/DragAndDropCommand.java
similarity index 99%
rename from bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/adt/design/editpolicies/DragAndDropCommand.java
rename to bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/commands/DragAndDropCommand.java
index 6ab9956..a9e254b 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/adt/design/editpolicies/DragAndDropCommand.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/commands/DragAndDropCommand.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xsd.adt.design.editpolicies;
+package org.eclipse.wst.xsd.editor.internal.commands;
 
 import java.util.ArrayList;
 import java.util.Iterator;

diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/design/editparts/XSDBaseFieldEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/design/editparts/XSDBaseFieldEditPart.java
index 58c7f21..1af72fe 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/design/editparts/XSDBaseFieldEditPart.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/design/editparts/XSDBaseFieldEditPart.java

@@ -10,12 +10,15 @@
  *******************************************************************************/
 package org.eclipse.wst.xsd.editor.internal.design.editparts;
 
+import org.eclipse.gef.EditPolicy;
 import org.eclipse.gef.GraphicalEditPart;
 import org.eclipse.wst.xsd.adt.design.IAnnotationProvider;
 import org.eclipse.wst.xsd.adt.design.editparts.BaseFieldEditPart;
 import org.eclipse.wst.xsd.adt.design.figures.IFieldFigure;
 import org.eclipse.wst.xsd.adt.facade.IField;
 import org.eclipse.wst.xsd.adt.outline.ITreeElement;
+import org.eclipse.wst.xsd.editor.internal.design.editpolicies.DragAndDropEditPolicy;
+import org.eclipse.wst.xsd.editor.internal.design.editpolicies.SelectionHandlesEditPolicyImpl;
 
 public class XSDBaseFieldEditPart extends BaseFieldEditPart
 {
@@ -65,4 +68,11 @@
     getFieldFigure().editPartAttached(this);
   }
 
+  protected SelectionHandlesEditPolicyImpl selectionHandlesEditPolicy = new SelectionHandlesEditPolicyImpl();
+  protected void createEditPolicies()
+  {
+    installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, adtDirectEditPolicy);
+    installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, selectionHandlesEditPolicy);
+    installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DragAndDropEditPolicy(getViewer(), selectionHandlesEditPolicy));
+  }
 }

diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/adt/design/editpolicies/DragAndDropEditPolicy.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/design/editpolicies/DragAndDropEditPolicy.java
similarity index 91%
rename from bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/adt/design/editpolicies/DragAndDropEditPolicy.java
rename to bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/design/editpolicies/DragAndDropEditPolicy.java
index 58d6463..adacf0b 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/adt/design/editpolicies/DragAndDropEditPolicy.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/design/editpolicies/DragAndDropEditPolicy.java

@@ -8,11 +8,12 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xsd.adt.design.editpolicies;
+package org.eclipse.wst.xsd.editor.internal.design.editpolicies;
 
 import org.eclipse.gef.EditPartViewer;
 import org.eclipse.gef.Request;
 import org.eclipse.gef.requests.ChangeBoundsRequest;
+import org.eclipse.wst.xsd.editor.internal.commands.DragAndDropCommand;
 
 public class DragAndDropEditPolicy extends org.eclipse.gef.editpolicies.GraphicalEditPolicy
 { 

diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/adt/design/editpolicies/GraphNodeDragTracker.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/design/editpolicies/GraphNodeDragTracker.java
similarity index 94%
rename from bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/adt/design/editpolicies/GraphNodeDragTracker.java
rename to bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/design/editpolicies/GraphNodeDragTracker.java
index 5fa0988..822a91d 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/adt/design/editpolicies/GraphNodeDragTracker.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/design/editpolicies/GraphNodeDragTracker.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xsd.adt.design.editpolicies;
+package org.eclipse.wst.xsd.editor.internal.design.editpolicies;
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.Request;
 import org.eclipse.gef.commands.Command;

diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/adt/design/editpolicies/SelectionHandlesEditPolicyImpl.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/design/editpolicies/SelectionHandlesEditPolicyImpl.java
similarity index 96%
rename from bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/adt/design/editpolicies/SelectionHandlesEditPolicyImpl.java
rename to bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/design/editpolicies/SelectionHandlesEditPolicyImpl.java
index 27932a2..05f7842 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/adt/design/editpolicies/SelectionHandlesEditPolicyImpl.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/design/editpolicies/SelectionHandlesEditPolicyImpl.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xsd.adt.design.editpolicies;
+package org.eclipse.wst.xsd.editor.internal.design.editpolicies;
                                  
 import java.util.ArrayList;
 import java.util.List;
@@ -33,6 +33,8 @@
 import org.eclipse.gef.requests.ChangeBoundsRequest;
 import org.eclipse.swt.graphics.Cursor;
 import org.eclipse.wst.xsd.adt.design.editparts.BaseEditPart;
+import org.eclipse.wst.xsd.adt.design.editpolicies.ADTSelectionFeedbackEditPolicy;
+import org.eclipse.wst.xsd.editor.internal.commands.DragAndDropCommand;
 
 
 public class SelectionHandlesEditPolicyImpl	extends ADTSelectionFeedbackEditPolicy

diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/adt/design/editparts/BaseFieldEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/adt/design/editparts/BaseFieldEditPart.java
index 9c78fac..05d422e 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/adt/design/editparts/BaseFieldEditPart.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/adt/design/editparts/BaseFieldEditPart.java

@@ -32,14 +32,13 @@
 import org.eclipse.wst.xsd.adt.design.directedit.TypeReferenceDirectEditManager;
 import org.eclipse.wst.xsd.adt.design.editparts.model.FocusTypeColumn;
 import org.eclipse.wst.xsd.adt.design.editpolicies.ADTDirectEditPolicy;
-import org.eclipse.wst.xsd.adt.design.editpolicies.DragAndDropEditPolicy;
-import org.eclipse.wst.xsd.adt.design.editpolicies.GraphNodeDragTracker;
+import org.eclipse.wst.xsd.adt.design.editpolicies.ADTSelectionFeedbackEditPolicy;
 import org.eclipse.wst.xsd.adt.design.editpolicies.IADTUpdateCommand;
-import org.eclipse.wst.xsd.adt.design.editpolicies.SelectionHandlesEditPolicyImpl;
 import org.eclipse.wst.xsd.adt.design.figures.IFieldFigure;
 import org.eclipse.wst.xsd.adt.facade.IField;
 import org.eclipse.wst.xsd.adt.facade.IType;
 import org.eclipse.wst.xsd.editor.internal.adapters.XSDElementDeclarationAdapter;
+import org.eclipse.wst.xsd.editor.internal.design.editpolicies.GraphNodeDragTracker;
 
 public class BaseFieldEditPart extends BaseTypeConnectingEditPart implements INamedEditPart
 {
@@ -119,12 +118,10 @@
     return connectionFigure;
   }
 
-  protected SelectionHandlesEditPolicyImpl selectionHandlesEditPolicy = new SelectionHandlesEditPolicyImpl();
   protected void createEditPolicies()
   {
     installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, adtDirectEditPolicy);
-    installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, selectionHandlesEditPolicy);
-    installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DragAndDropEditPolicy(getViewer(), selectionHandlesEditPolicy));
+    installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new ADTSelectionFeedbackEditPolicy());
   }
  
   public void refresh()