cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r431898 - in /incubator/cayenne/soc/trunk/cayenne-rop/rop-browser: ./ META-INF/ lib/ src/org/apache/cayenne/ropbrowser/ src/org/apache/cayenne/ropbrowser/actions/ src/org/apache/cayenne/ropbrowser/commands/ src/org/apache/cayenne/ropbrowser...
Date Wed, 16 Aug 2006 13:42:51 GMT
Author: aadamchik
Date: Wed Aug 16 06:42:50 2006
New Revision: 431898

URL: http://svn.apache.org/viewvc?rev=431898&view=rev
Log:
CAY-629 sans derby

Added:
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/lib/cayenne-jdk1.4-core-3.0-incubating-SNAPSHOT.jar
  (with props)
Removed:
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/lib/cayenne-client-nodeps-1.2.jar
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/policies/ElementEditPolicy.java
Modified:
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/.classpath
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/META-INF/MANIFEST.MF
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/build.properties
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ConnectionManager.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ObjectEditor.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ObjectEditorInput.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ROPPerspectiveFactory.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/ExistingAction.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/ROPActionBarContributor.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/ToggleLayoutAction.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ExpandRelationshipCommand.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ObjectInsertCommand.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/figures/CollectionFigure.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/figures/ElementFigure.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/figures/SingleFigure.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/AbstractObject.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/CollectionModelElement.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/ElementDiagram.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/MemberConnection.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/RelationshipConnection.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/auto/_Painting.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/parts/ElementDiagramEditPart.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/parts/ElementEditPart.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/parts/SingleEditPart.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/views/ControlPanelView.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/wizards/SelectObjectPage.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/wizards/SelectParametersPage.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/wizards/SelectQueryWizard.java

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/.classpath
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/.classpath?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/.classpath (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/.classpath Wed Aug 16 06:42:50 2006
@@ -8,7 +8,7 @@
 	<classpathentry kind="lib" path="lib/commons-logging.jar"/>
 	<classpathentry kind="lib" path="lib/smackx-2.2.1.jar"/>
 	<classpathentry sourcepath="G:/soc/smack-dev-2.2.1/source" kind="lib" path="lib/smack-2.2.1.jar"/>
-	<classpathentry sourcepath="/cayenne-java/src/cayenne/java" kind="lib" path="lib/cayenne-client-nodeps-1.2.jar"/>
 	<classpathentry kind="lib" path="lib/hessian-3.0.13.jar"/>
+	<classpathentry kind="lib" path="lib/cayenne-jdk1.4-core-3.0-incubating-SNAPSHOT.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/META-INF/MANIFEST.MF?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/META-INF/MANIFEST.MF (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/META-INF/MANIFEST.MF Wed Aug 16 06:42:50
2006
@@ -10,9 +10,9 @@
  lib/commons-logging.jar,
  lib/commons-lang-2.1.jar,
  lib/commons-collections-3.1.jar,
- lib/cayenne-client-nodeps-1.2.jar,
  lib/smack-2.2.1.jar,
- lib/smackx-2.2.1.jar
+ lib/smackx-2.2.1.jar,
+ lib/cayenne-jdk1.4-core-3.0-incubating-SNAPSHOT.jar
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.ui.forms,

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/build.properties
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/build.properties?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/build.properties (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/build.properties Wed Aug 16 06:42:50
2006
@@ -5,7 +5,7 @@
                lib/commons-logging.jar,\
                lib/commons-lang-2.1.jar,\
                lib/commons-collections-3.1.jar,\
-               lib/cayenne-client-nodeps-1.2.jar,\
                lib/smack-2.2.1.jar,\
-               lib/smackx-2.2.1.jar
+               lib/smackx-2.2.1.jar,\
+               lib/cayenne-jdk1.4-core-3.0-incubating-SNAPSHOT.jar
 

Added: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/lib/cayenne-jdk1.4-core-3.0-incubating-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/lib/cayenne-jdk1.4-core-3.0-incubating-SNAPSHOT.jar?rev=431898&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/lib/cayenne-jdk1.4-core-3.0-incubating-SNAPSHOT.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ConnectionManager.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ConnectionManager.java?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ConnectionManager.java
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ConnectionManager.java
Wed Aug 16 06:42:50 2006
@@ -20,12 +20,12 @@
 import java.util.Hashtable;
 
 import org.eclipse.core.runtime.Status;
-import org.objectstyle.cayenne.CayenneContext;
-import org.objectstyle.cayenne.DataChannel;
-import org.objectstyle.cayenne.ObjectContext;
-import org.objectstyle.cayenne.graph.GraphEvent;
-import org.objectstyle.cayenne.remote.ClientChannel;
-import org.objectstyle.cayenne.remote.hessian.HessianConnection;
+import org.apache.cayenne.CayenneContext;
+import org.apache.cayenne.DataChannel;
+import org.apache.cayenne.ObjectContext;
+import org.apache.cayenne.graph.GraphEvent;
+import org.apache.cayenne.remote.ClientChannel;
+import org.apache.cayenne.remote.hessian.HessianConnection;
 
 /**
  * Singleton class which manages connections to the Cayenne web service,

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ObjectEditor.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ObjectEditor.java?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ObjectEditor.java
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ObjectEditor.java
Wed Aug 16 06:42:50 2006
@@ -33,14 +33,15 @@
 import org.eclipse.gef.DefaultEditDomain;
 import org.eclipse.gef.GraphicalViewer;
 import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
+import org.eclipse.gef.ui.actions.PrintAction;
 import org.eclipse.gef.ui.parts.GraphicalEditor;
 import org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
-import org.objectstyle.cayenne.DataChannel;
-import org.objectstyle.cayenne.ObjectContext;
-import org.objectstyle.cayenne.graph.GraphEvent;
+import org.apache.cayenne.DataChannel;
+import org.apache.cayenne.ObjectContext;
+import org.apache.cayenne.graph.GraphEvent;
 
 /**
  * Editor class allowing visual editing of database data via
@@ -105,7 +106,6 @@
 	 */
 	@Override
 	public void doSave(IProgressMonitor monitor) {
-		// TODO allow save view settings to a file??
 		elementDiagram.commitChanges();
 		dirty = false;
 		firePropertyChange(IEditorPart.PROP_DIRTY);
@@ -145,10 +145,7 @@
 		ObjectContext inputContext = ((ObjectEditorInput) input).getContext();
 		elementDiagram = new ElementDiagram(inputContext);
 	}
-	
-	/**
-	 * Create the actions available to the user via menus and toolbars.
-	 */
+
 	@Override
 	protected void createActions() {
 		super.createActions();
@@ -181,6 +178,9 @@
 		getActionRegistry().registerAction(action);
 		
 		action = new RollbackAction(this);
+		getActionRegistry().registerAction(action);
+		
+		action = new PrintAction(this);
 		getActionRegistry().registerAction(action);
 	}
 

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ObjectEditorInput.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ObjectEditorInput.java?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ObjectEditorInput.java
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ObjectEditorInput.java
Wed Aug 16 06:42:50 2006
@@ -19,7 +19,7 @@
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IPersistableElement;
-import org.objectstyle.cayenne.ObjectContext;
+import org.apache.cayenne.ObjectContext;
 
 /**
  * Input for the ObjectEditor class, providing the information

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ROPPerspectiveFactory.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ROPPerspectiveFactory.java?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ROPPerspectiveFactory.java
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ROPPerspectiveFactory.java
Wed Aug 16 06:42:50 2006
@@ -19,6 +19,12 @@
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
 
+/**
+ * Perspective for setting up the editor together with the ControlPanelView
+ * and the Eclipse Properties view.
+ * 
+ * @author Marcel Gordon
+ */
 public class ROPPerspectiveFactory implements IPerspectiveFactory {
 
 	public void createInitialLayout(IPageLayout layout) {

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/ExistingAction.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/ExistingAction.java?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/ExistingAction.java
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/ExistingAction.java
Wed Aug 16 06:42:50 2006
@@ -31,8 +31,8 @@
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IWorkbenchPart;
-import org.objectstyle.cayenne.ObjectContext;
-import org.objectstyle.cayenne.map.ObjEntity;
+import org.apache.cayenne.ObjectContext;
+import org.apache.cayenne.map.ObjEntity;
 
 /**
  * An action which sends an {@link ExistingObjectRequest} to selected parts.

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/ROPActionBarContributor.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/ROPActionBarContributor.java?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/ROPActionBarContributor.java
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/ROPActionBarContributor.java
Wed Aug 16 06:42:50 2006
@@ -16,20 +16,30 @@
 package org.apache.cayenne.ropbrowser.actions;
 
 import org.eclipse.gef.ui.actions.ActionBarContributor;
+import org.eclipse.ui.IWorkbenchActionConstants;
 import org.eclipse.ui.actions.ActionFactory;
 import org.eclipse.ui.actions.RetargetAction;
 import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
 
+/**
+ * ActionBarContributor for the ObjectEditor. Ensures that global
+ * actions are enabled in the workbench menus, along with the
+ * keyboard shortcuts.
+ * 
+ * @author Marcel Gordon
+ */
 public class ROPActionBarContributor extends ActionBarContributor {
 
 	@Override
-
 	protected void buildActions() {
-		IWorkbenchAction undo=ActionFactory.UNDO.create(getPage().getWorkbenchWindow());
+		IWorkbenchAction undo = ActionFactory.UNDO.create(getPage().getWorkbenchWindow());
 		addRetargetAction((RetargetAction) undo);
 	
-		IWorkbenchAction redo=ActionFactory.REDO.create(getPage().getWorkbenchWindow());
+		IWorkbenchAction redo = ActionFactory.REDO.create(getPage().getWorkbenchWindow());
 		addRetargetAction((RetargetAction) redo);
+		
+		IWorkbenchAction print = ActionFactory.PRINT.create(getPage().getWorkbenchWindow());
+		addRetargetAction((RetargetAction) print);
 	}
 
 	@Override

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/ToggleLayoutAction.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/ToggleLayoutAction.java?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/ToggleLayoutAction.java
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/ToggleLayoutAction.java
Wed Aug 16 06:42:50 2006
@@ -24,7 +24,7 @@
  * 
  * @author Marcel Gordon
  */
-public class ToggleLayoutAction  extends Action {
+public class ToggleLayoutAction extends Action {
 	
 	/**
 	 * The editor on which the layout should be toggled.

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ExpandRelationshipCommand.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ExpandRelationshipCommand.java?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ExpandRelationshipCommand.java
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ExpandRelationshipCommand.java
Wed Aug 16 06:42:50 2006
@@ -20,7 +20,7 @@
 import org.apache.cayenne.ropbrowser.model.RelationshipConnection;
 import org.apache.cayenne.ropbrowser.model.SingleModelElement;
 import org.eclipse.gef.commands.Command;
-import org.objectstyle.cayenne.map.Relationship;
+import org.apache.cayenne.map.Relationship;
 
 /**
  * Command to expand a relationship from a {@link SingleModelElement},

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ObjectInsertCommand.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ObjectInsertCommand.java?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ObjectInsertCommand.java
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ObjectInsertCommand.java
Wed Aug 16 06:42:50 2006
@@ -19,7 +19,7 @@
 import org.apache.cayenne.ropbrowser.model.CollectionModelElement;
 import org.apache.cayenne.ropbrowser.model.ModelElement;
 import org.eclipse.gef.commands.Command;
-import org.objectstyle.cayenne.map.ObjEntity;
+import org.apache.cayenne.map.ObjEntity;
 
 /**
  * Command to insert a new object into an element

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/figures/CollectionFigure.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/figures/CollectionFigure.java?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/figures/CollectionFigure.java
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/figures/CollectionFigure.java
Wed Aug 16 06:42:50 2006
@@ -28,7 +28,7 @@
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.MarginBorder;
 import org.eclipse.draw2d.ToolbarLayout;
-import org.objectstyle.cayenne.map.Attribute;
+import org.apache.cayenne.map.Attribute;
 
 /**
  * Figure representing a {@link CollectionEditPart}.
@@ -37,16 +37,12 @@
  * 
  * @author Marcel Gordon
  */
-public class CollectionFigure extends ElementFigure implements ActionListener {
+public class CollectionFigure extends ElementFigure {
 	
 	/**
 	 * Figure to act as a dropdown box to allow quick navigation through objects.
 	 */
 	private DropdownFigure navFigure;
-	/**
-	 * The name of the attribute that was last displayed in the nav figure.
-	 */
-	private String lastNavAttribute = null;
 
 	public CollectionFigure(CollectionEditPart part) {
 		super(part);
@@ -56,7 +52,7 @@
 	protected void addComponents() {
 		super.addComponents();
 		
-		navFigure = new DropdownFigure();
+		navFigure = new DropdownFigure(this);
 		ToolbarLayout layout = new ToolbarLayout();
 		layout.setMinorAlignment(ToolbarLayout.ALIGN_TOPLEFT);
 		layout.setStretchMinorAxis(false);
@@ -108,7 +104,7 @@
 	protected void setAttributes(AbstractObject model) {
 		for (Object child : getAttributeCompartment().getChildren()) {
 			if (child instanceof Button) {
-				((Button) child).removeActionListener(this);
+				((Button) child).removeActionListener(navFigure);
 			}
 		}
 		getAttributeCompartment().removeAll();
@@ -121,13 +117,13 @@
 				Button b;
 				
 				String attributeValue = model.getPropertyValue(a.getName());
-				if (attributeValue.length() > MAX_ATTRIBUTE_LENGTH) {
+				if (attributeValue != null && attributeValue.length() > MAX_ATTRIBUTE_LENGTH)
{
 					attributeValue = attributeValue.substring(0, MAX_ATTRIBUTE_LENGTH - 3);
 					attributeValue += "...";
 				}
 				
 				// if expanded, use open icon, else closed
-				if (lastNavAttribute != null && a.getName().equals(lastNavAttribute)) {
+				if (navFigure.isExpanded(a.getName())) {
 					b = new Button(a.getName() + " : " + attributeValue + " ", ROPBrowserPlugin.getDefault().getImageRegistry().get(ROPBrowserPlugin.IMG_DROP_OPEN));
 				}
 				else {
@@ -138,50 +134,38 @@
 				}
 				b.setBorder(null);
 				b.setOpaque(false);
-				b.addActionListener(this);
+				b.addActionListener(navFigure);
 				// set the user data to the attribute name for the action listener
 				b.getModel().setUserData(a.getName());
 				getAttributeCompartment().add(b);
 				
 				// if this is in an expanded state, insert the nav figure like a dropdown
-				if (lastNavAttribute != null && a.getName().equals(lastNavAttribute)) {
+				if (navFigure.isExpanded(a.getName())) {
 					Iterator<AbstractObject> iterator = getElementCast().getSortedObjectIterator(a.getName());
-					navFigure.populateDropdown(a.getName(), getPartCast(), iterator);
-					// add the navFigure to the attribute compartment
-					getAttributeCompartment().add(navFigure);
+					navFigure.populateDropdown(getPartCast(), iterator);
 				}
 			}	
 		}
 	}
+}
+
+class DropdownFigure extends CompartmentFigure implements ActionListener {
+	
+	private static final String LABEL_NULL = "null";
 	
 	/**
-	 * Handle button presses from the attribute buttons.
-	 * On open, set the lastNavAttribute to the name of the attribute pressed
-	 * and refresh the figure.
-	 * On close, remove the navFigure and set the lastNavAttribute to null
+	 * The name of the attribute that was last displayed in the nav figure.
 	 */
-	public void actionPerformed(ActionEvent event) {
-		
-		Button buttonPressed = (Button) event.getSource();
-		String pressed = (String) buttonPressed.getModel().getUserData();
-		
-		if (lastNavAttribute != null && lastNavAttribute.equals(pressed)) {
-			lastNavAttribute = null;
-			getAttributeCompartment().remove(navFigure);
-		}
-		else {
-			lastNavAttribute = pressed;
-		}
-		
-		refresh();
-	}
-}
+	private String lastNavAttribute = null;
 
-class DropdownFigure extends CompartmentFigure {
+	private CollectionFigure collection;
 	
-	private static final String LABEL_NULL = "null";
+	public DropdownFigure(CollectionFigure collection) {
+		super();
+		this.collection = collection;
+	}
 
-	public void populateDropdown(String attributeName, ActionListener actionListener, Iterator<AbstractObject>
iterator) {
+	public void populateDropdown(ActionListener actionListener, Iterator<AbstractObject>
iterator) {
 		// remove any existing buttons from the navFigure
 		for (Object child : getChildren()) {
 			if (child instanceof Button) {
@@ -194,7 +178,7 @@
 		while (iterator.hasNext()) {
 			AbstractObject o = iterator.next();
 			// label the button with the attribute's value for this object
-			String attributeValue = o.getPropertyValue(attributeName);
+			String attributeValue = o.getPropertyValue(lastNavAttribute);
 			Button b;
 			if (attributeValue != null) {
 				if (attributeValue.length() > ElementFigure.MAX_ATTRIBUTE_LENGTH) {
@@ -214,6 +198,36 @@
 			b.addActionListener(actionListener);
 			add(b);
 		}
+		
+		collection.add(this);
+	}
+	
+	/**
+	 * Handle button presses from the attribute buttons.
+	 * On open, set the lastNavAttribute to the name of the attribute pressed
+	 * and refresh the figure.
+	 * On close, remove the navFigure and set the lastNavAttribute to null
+	 */
+	public void actionPerformed(ActionEvent event) {
+		
+		Button buttonPressed = (Button) event.getSource();
+		String pressed = (String) buttonPressed.getModel().getUserData();
+		
+		if (lastNavAttribute != null && lastNavAttribute.equals(pressed)) {
+			lastNavAttribute = null;
+			getParent().remove(this);
+		}
+		else {
+			lastNavAttribute = pressed;
+		}
+		
+		collection.refresh();
 	}
 	
+	public boolean isExpanded(String attributeName) {
+		if (lastNavAttribute == null) {
+			return false;
+		}
+		return lastNavAttribute.equals(attributeName);
+	}
 }

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/figures/ElementFigure.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/figures/ElementFigure.java?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/figures/ElementFigure.java
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/figures/ElementFigure.java
Wed Aug 16 06:42:50 2006
@@ -28,7 +28,7 @@
 import org.eclipse.draw2d.LineBorder;
 import org.eclipse.draw2d.ToolbarLayout;
 import org.eclipse.swt.widgets.Display;
-import org.objectstyle.cayenne.map.Attribute;
+import org.apache.cayenne.map.Attribute;
 
 /**
  * A superclass for figures representing parts which extend
@@ -107,7 +107,7 @@
 			while (i.hasNext()) {
 				Attribute a = (Attribute) i.next();
 				String attributeValue = model.getPropertyValue(a.getName());
-				if (attributeValue.length() > MAX_ATTRIBUTE_LENGTH) {
+				if (attributeValue != null && attributeValue.length() > MAX_ATTRIBUTE_LENGTH)
{
 					attributeValue = attributeValue.substring(0, MAX_ATTRIBUTE_LENGTH - 3);
 					attributeValue += "...";
 				}

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/figures/SingleFigure.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/figures/SingleFigure.java?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/figures/SingleFigure.java
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/figures/SingleFigure.java
Wed Aug 16 06:42:50 2006
@@ -23,7 +23,7 @@
 import org.eclipse.draw2d.CompoundBorder;
 import org.eclipse.draw2d.MarginBorder;
 import org.eclipse.swt.widgets.Display;
-import org.objectstyle.cayenne.map.Relationship;
+import org.apache.cayenne.map.Relationship;
 
 /**
  * Figure representing a {@link SingleEditPart}.

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/AbstractObject.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/AbstractObject.java?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/AbstractObject.java
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/AbstractObject.java
Wed Aug 16 06:42:50 2006
@@ -28,14 +28,14 @@
 import org.apache.cayenne.ropbrowser.TypeConverter;
 import org.eclipse.ui.views.properties.IPropertyDescriptor;
 import org.eclipse.ui.views.properties.TextPropertyDescriptor;
-import org.objectstyle.cayenne.PersistenceState;
-import org.objectstyle.cayenne.PersistentObject;
-import org.objectstyle.cayenne.map.Attribute;
-import org.objectstyle.cayenne.map.EntityResolver;
-import org.objectstyle.cayenne.map.ObjAttribute;
-import org.objectstyle.cayenne.map.ObjEntity;
-import org.objectstyle.cayenne.map.Relationship;
-import org.objectstyle.cayenne.property.ClassDescriptor;
+import org.apache.cayenne.PersistenceState;
+import org.apache.cayenne.PersistentObject;
+import org.apache.cayenne.map.Attribute;
+import org.apache.cayenne.map.EntityResolver;
+import org.apache.cayenne.map.ObjAttribute;
+import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.map.Relationship;
+import org.apache.cayenne.property.ClassDescriptor;
 
 /**
  * Base class for all persistent objects, allowing generic access
@@ -46,8 +46,8 @@
  */
 public class AbstractObject extends PersistentObject {	
 	
-	/** Property indicating that the object has been deleted */
-	public static final String PROP_DELETED = "AbstractObject.Deleted";
+	/** Property indicating that the object's persistence state has changed */
+	public static final String PROP_PERSISTENCE_STATE = "AbstractObject.PersistenceState";
 	/** Property indicating that the object has been modified */
 	public static final String PROP_MODIFIED = "AbstractObject.Modified";
 	
@@ -104,7 +104,7 @@
 	}
 
 	/**
-	 * @return a collection of {@link org.objectstyle.cayenne.map.Attribute} objects.
+	 * @return a collection of {@link org.apache.cayenne.map.Attribute} objects.
 	 */
 	public Collection getAttributes() {
 		if (attributes != null) {
@@ -222,14 +222,9 @@
 	public void setPersistenceState(int persistenceState) {
 		int oldState = getPersistenceState();
 		super.setPersistenceState(persistenceState);
-		switch (persistenceState) {
-			case PersistenceState.DELETED : 
-				firePropertyChange(PROP_DELETED, oldState, persistenceState);
-				break;
-			case PersistenceState.TRANSIENT : //moving to transient means deleted in this context
-				firePropertyChange(PROP_DELETED, oldState, persistenceState);
-				break;
-		} 
+		if (oldState != persistenceState) {
+			firePropertyChange(PROP_PERSISTENCE_STATE, oldState, persistenceState);
+		}
 	}
 
 	/**
@@ -283,7 +278,8 @@
 			descriptor.getProperty(rel.getName()).writeProperty(this, oldValue, newValue);
 			
 			// notify objectContext about simple property change
-	        objectContext.propertyChanged(this, rel.getName(), oldValue, newValue);
+			objectContext.propertyChanged(this, rel.getName(), oldValue, newValue);
+			firePropertyChange(PROP_MODIFIED, null, this);
 		}
 	}
 

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/CollectionModelElement.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/CollectionModelElement.java?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/CollectionModelElement.java
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/CollectionModelElement.java
Wed Aug 16 06:42:50 2006
@@ -22,7 +22,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.objectstyle.cayenne.util.PersistentObjectList;
+import org.apache.cayenne.util.PersistentObjectList;
 
 
 /**

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/ElementDiagram.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/ElementDiagram.java?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/ElementDiagram.java
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/ElementDiagram.java
Wed Aug 16 06:42:50 2006
@@ -22,10 +22,10 @@
 import java.util.EventObject;
 import java.util.List;
 
-import org.objectstyle.cayenne.DataChannel;
-import org.objectstyle.cayenne.ObjectContext;
-import org.objectstyle.cayenne.event.EventSubject;
-import org.objectstyle.cayenne.graph.GraphEvent;
+import org.apache.cayenne.DataChannel;
+import org.apache.cayenne.ObjectContext;
+import org.apache.cayenne.event.EventSubject;
+import org.apache.cayenne.graph.GraphEvent;
 
 /**
  * The root component in the model - a diagram of {@link ModelElement}s and 
@@ -45,8 +45,6 @@
 	public static final String PROP_NODE_REMOVED = "ElementDiagram.NodeRemoved";
 	/** property indicating that changes have been rolled back */
 	public static final String PROP_ROLLBACK = "ElementDiagram.GraphRollback";
-	/** property indicating that there has been an external change to the model */
-	public static final String PROP_EXT_CHANGE = "ElementDiagram.ExternalChange";
 	/** whether automatic layout is being used (rather than manual) */
 	private boolean autoLayout;
 	/** the Cayenne context in which the objects represented by the ModelElements exist */

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/MemberConnection.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/MemberConnection.java?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/MemberConnection.java
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/MemberConnection.java
Wed Aug 16 06:42:50 2006
@@ -16,7 +16,7 @@
  */
 package org.apache.cayenne.ropbrowser.model;
 
-import org.objectstyle.cayenne.map.Relationship;
+import org.apache.cayenne.map.Relationship;
 
 /**
  * A connection between a {@link CollectionModelElement} and a

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/RelationshipConnection.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/RelationshipConnection.java?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/RelationshipConnection.java
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/RelationshipConnection.java
Wed Aug 16 06:42:50 2006
@@ -16,7 +16,7 @@
  */
 package org.apache.cayenne.ropbrowser.model;
 
-import org.objectstyle.cayenne.map.Relationship;
+import org.apache.cayenne.map.Relationship;
 
 /**
  * A connection between a {@link SingleModelElement} and another

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/auto/_Painting.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/auto/_Painting.java?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/auto/_Painting.java
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/auto/_Painting.java
Wed Aug 16 06:42:50 2006
@@ -3,7 +3,7 @@
 import org.apache.cayenne.ropbrowser.model.AbstractObject;
 import org.apache.cayenne.ropbrowser.model.Artist;
 import org.apache.cayenne.ropbrowser.model.Gallery;
-import org.objectstyle.cayenne.ValueHolder;
+import org.apache.cayenne.ValueHolder;
 
 /**
  * A generated persistent class mapped as "Painting" Cayenne entity. It is a good idea to

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/parts/ElementDiagramEditPart.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/parts/ElementDiagramEditPart.java?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/parts/ElementDiagramEditPart.java
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/parts/ElementDiagramEditPart.java
Wed Aug 16 06:42:50 2006
@@ -146,14 +146,8 @@
 			hideNullObjects();
 		}
 		else if (ElementDiagram.PROP_ROLLBACK.equals(prop)) {
-			for (Object o : getChildren()) {
-				ElementFigure figure = (ElementFigure) ((ElementEditPart) o).getFigure();
-				figure.refresh();
-			}
 			hideNullObjects();
-		}
-		else if (ElementDiagram.PROP_EXT_CHANGE.equals(prop)) {
-			refreshChildren();
+			getViewer().getEditDomain().getCommandStack().flush();
 		}
 	}
 

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/parts/ElementEditPart.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/parts/ElementEditPart.java?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/parts/ElementEditPart.java
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/parts/ElementEditPart.java
Wed Aug 16 06:42:50 2006
@@ -34,7 +34,6 @@
 import org.apache.cayenne.ropbrowser.commands.SetNameElementRequest;
 import org.apache.cayenne.ropbrowser.figures.ElementFigure;
 import org.apache.cayenne.ropbrowser.model.ModelElement;
-import org.apache.cayenne.ropbrowser.policies.ElementEditPolicy;
 import org.apache.cayenne.ropbrowser.policies.ElementLayoutEditPolicy;
 import org.eclipse.draw2d.ChopboxAnchor;
 import org.eclipse.draw2d.ConnectionAnchor;
@@ -89,8 +88,6 @@
 	 */
 	@Override
 	protected void createEditPolicies() {
-		// allow removal of the associated model element
-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ElementEditPolicy());
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new ElementLayoutEditPolicy());
 	}
 	

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/parts/SingleEditPart.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/parts/SingleEditPart.java?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/parts/SingleEditPart.java
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/parts/SingleEditPart.java
Wed Aug 16 06:42:50 2006
@@ -33,7 +33,7 @@
 import org.eclipse.gef.EditPolicy;
 import org.eclipse.gef.Request;
 import org.eclipse.gef.commands.Command;
-import org.objectstyle.cayenne.map.Relationship;
+import org.apache.cayenne.map.Relationship;
 
 /**
  * {@link EditPart} for the {@link SingleModelElement} class. Allows the expansion

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/views/ControlPanelView.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/views/ControlPanelView.java?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/views/ControlPanelView.java
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/views/ControlPanelView.java
Wed Aug 16 06:42:50 2006
@@ -45,16 +45,16 @@
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Section;
 import org.eclipse.ui.part.ViewPart;
-import org.objectstyle.cayenne.ObjectContext;
-import org.objectstyle.cayenne.exp.Expression;
-import org.objectstyle.cayenne.exp.ExpressionFactory;
-import org.objectstyle.cayenne.exp.parser.ASTObjPath;
-import org.objectstyle.cayenne.map.EntityResolver;
-import org.objectstyle.cayenne.map.ObjEntity;
-import org.objectstyle.cayenne.query.NamedQuery;
-import org.objectstyle.cayenne.query.Query;
-import org.objectstyle.cayenne.query.SelectQuery;
-import org.objectstyle.cayenne.util.Util;
+import org.apache.cayenne.ObjectContext;
+import org.apache.cayenne.exp.Expression;
+import org.apache.cayenne.exp.ExpressionFactory;
+import org.apache.cayenne.exp.parser.ASTObjPath;
+import org.apache.cayenne.map.EntityResolver;
+import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.query.NamedQuery;
+import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.util.Util;
 
 /**
  * An Eclipse view for connecting to the Cayenne web service and launching queries

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/wizards/SelectObjectPage.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/wizards/SelectObjectPage.java?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/wizards/SelectObjectPage.java
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/wizards/SelectObjectPage.java
Wed Aug 16 06:42:50 2006
@@ -35,15 +35,15 @@
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
-import org.objectstyle.cayenne.ObjectContext;
-import org.objectstyle.cayenne.exp.Expression;
-import org.objectstyle.cayenne.exp.ExpressionFactory;
-import org.objectstyle.cayenne.exp.parser.ASTObjPath;
-import org.objectstyle.cayenne.map.EntityResolver;
-import org.objectstyle.cayenne.map.ObjAttribute;
-import org.objectstyle.cayenne.map.ObjEntity;
-import org.objectstyle.cayenne.query.SelectQuery;
-import org.objectstyle.cayenne.util.Util;
+import org.apache.cayenne.ObjectContext;
+import org.apache.cayenne.exp.Expression;
+import org.apache.cayenne.exp.ExpressionFactory;
+import org.apache.cayenne.exp.parser.ASTObjPath;
+import org.apache.cayenne.map.EntityResolver;
+import org.apache.cayenne.map.ObjAttribute;
+import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.util.Util;
 
 /**
  * {@link WizardPage} for {@link SelectQueryWizard} which displays a list of objects

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/wizards/SelectParametersPage.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/wizards/SelectParametersPage.java?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/wizards/SelectParametersPage.java
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/wizards/SelectParametersPage.java
Wed Aug 16 06:42:50 2006
@@ -45,11 +45,11 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
-import org.objectstyle.cayenne.ObjectContext;
-import org.objectstyle.cayenne.exp.Expression;
-import org.objectstyle.cayenne.map.EntityResolver;
-import org.objectstyle.cayenne.map.ObjAttribute;
-import org.objectstyle.cayenne.map.ObjEntity;
+import org.apache.cayenne.ObjectContext;
+import org.apache.cayenne.exp.Expression;
+import org.apache.cayenne.map.EntityResolver;
+import org.apache.cayenne.map.ObjAttribute;
+import org.apache.cayenne.map.ObjEntity;
 
 /**
  * {@link WizardPage} for use with {@link SelectQueryWizard} which allows the specification
of query parameters.

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/wizards/SelectQueryWizard.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/wizards/SelectQueryWizard.java?rev=431898&r1=431897&r2=431898&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/wizards/SelectQueryWizard.java
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/wizards/SelectQueryWizard.java
Wed Aug 16 06:42:50 2006
@@ -19,8 +19,8 @@
 
 import org.apache.cayenne.ropbrowser.model.AbstractObject;
 import org.eclipse.jface.wizard.Wizard;
-import org.objectstyle.cayenne.ObjectContext;
-import org.objectstyle.cayenne.query.SelectQuery;
+import org.apache.cayenne.ObjectContext;
+import org.apache.cayenne.query.SelectQuery;
 
 /**
  * A {@link Wizard} for use with {@link SelectQuery}. Can be used in



Mime
View raw message