cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r442563 [1/3] - in /incubator/cayenne/soc/trunk/cayenne-rop/rop-browser: ./ src/org/apache/cayenne/ropbrowser/ src/org/apache/cayenne/ropbrowser/actions/ src/org/apache/cayenne/ropbrowser/commands/ src/org/apache/cayenne/ropbrowser/figures/...
Date Tue, 12 Sep 2006 11:28:54 GMT
Author: aadamchik
Date: Tue Sep 12 04:28:51 2006
New Revision: 442563

URL: http://svn.apache.org/viewvc?view=rev&rev=442563
Log:
CAY-634

Added:
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/TypeConverter.java
      - copied, changed from r429528, incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/TypeConverter.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/views/EntitySelectionDialog.java
Removed:
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/build.properties
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/TypeConverter.java
Modified:
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/.classpath
    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/ObjectEditorContextMenuProvider.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/ROPBrowserPlugin.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/DeleteAction.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/HideAction.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/InsertAction.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/RemoveAction.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/RollbackAction.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/SetNameAction.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/ContractRelationshipCommand.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/DeleteObjectCommand.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ElementSetConstraintCommand.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ExistingObjectCommand.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ExistingObjectRequest.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/HideElementCommand.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/NextObjectCommand.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/commands/PopOutCommand.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/RemoveObjectCommand.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/SetNameElementCommand.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/SetNameElementRequest.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/layout/DelegatingLayoutManager.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/layout/DirectedGraphLayoutVisitor.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/layout/GraphLayoutManager.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/layout/GraphXYLayout.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/Connection.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/ModelElement.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/SingleModelElement.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/auto/_Artist.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/auto/_Gallery.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/CollectionEditPart.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/ElementEditPartFactory.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/policies/CollectionDirectEditPolicy.java
    incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/policies/CollectionSelectionPolicy.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?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/.classpath (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/.classpath Tue Sep 12 04:28:51 2006
@@ -9,6 +9,6 @@
 	<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 kind="lib" path="lib/hessian-3.0.13.jar"/>
-	<classpathentry kind="lib" path="lib/cayenne-jdk1.4-core-3.0-incubating-SNAPSHOT.jar"/>
+	<classpathentry sourcepath="/cayenne-jdk1.4-core/src/main/java" 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/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?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- 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 Tue Sep 12 04:28:51 2006
@@ -19,11 +19,9 @@
 
 import java.util.Hashtable;
 
-import org.eclipse.core.runtime.Status;
 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;
 
@@ -44,7 +42,7 @@
 	private Hashtable<String, DataChannel> connections;
 	
 	private ConnectionManager() {
-		connections = new Hashtable<String, DataChannel>();
+		this.connections = new Hashtable<String, DataChannel>();
 	}
 	
 	/**
@@ -67,14 +65,14 @@
 		
 		DataChannel channel = null;
 		
-		if (sharedSession && connections.containsKey(address)) {
-			channel = connections.get(address);
+		if (sharedSession && this.connections.containsKey(address)) {
+			channel = this.connections.get(address);
 		}
 		else {
 			if (sharedSession) {
 				HessianConnection connection = new HessianConnection(address, null, null, "conference");
 				channel = new ClientChannel(connection);
-				connections.put(address, channel);
+				this.connections.put(address, channel);
 			}
 			else {
 				HessianConnection connection = new HessianConnection(address);

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?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- 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 Tue Sep 12 04:28:51 2006
@@ -39,9 +39,7 @@
 import org.eclipse.jface.action.IAction;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
-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
@@ -62,13 +60,13 @@
 	
 	public ObjectEditor() {
 		setEditDomain(new DefaultEditDomain(this));
-		dirty = false;
+		this.dirty = false;
 	}
 	
 	@Override
 	protected void initializeGraphicalViewer() {
 		GraphicalViewer viewer = getGraphicalViewer();
-		viewer.setContents(elementDiagram);
+		viewer.setContents(this.elementDiagram);
 	}
 	
 	/**
@@ -96,7 +94,7 @@
 	 */
 	@Override
 	public void commandStackChanged(EventObject event) {
-		dirty = true;
+		this.dirty = true;
 		firePropertyChange(IEditorPart.PROP_DIRTY);
 		super.commandStackChanged(event);
 	}
@@ -106,8 +104,8 @@
 	 */
 	@Override
 	public void doSave(IProgressMonitor monitor) {
-		elementDiagram.commitChanges();
-		dirty = false;
+		this.elementDiagram.commitChanges();
+		this.dirty = false;
 		firePropertyChange(IEditorPart.PROP_DIRTY);
 	}
 	
@@ -116,7 +114,7 @@
 	 */
 	@Override
 	public boolean isDirty() {
-		return dirty;
+		return this.dirty;
 	}
 
 	/**
@@ -143,7 +141,7 @@
 		super.setInput(input);
 		// create the diagram using the context from the input
 		ObjectContext inputContext = ((ObjectEditorInput) input).getContext();
-		elementDiagram = new ElementDiagram(inputContext);
+		this.elementDiagram = new ElementDiagram(inputContext);
 	}
 
 	@Override
@@ -166,7 +164,7 @@
 		getActionRegistry().registerAction(action);
 		getSelectionActions().add(action.getId());
 		
-		action = new ExistingAction(this, elementDiagram.getObjectContext());
+		action = new ExistingAction(this, this.elementDiagram.getObjectContext());
 		getActionRegistry().registerAction(action);
 		getSelectionActions().add(action.getId());
 		
@@ -188,6 +186,6 @@
 	 * @return the diagram that is the root of the model for this editor
 	 */
 	public ElementDiagram getDiagram() {
-		return elementDiagram;
+		return this.elementDiagram;
 	}
 }

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ObjectEditorContextMenuProvider.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ObjectEditorContextMenuProvider.java?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ObjectEditorContextMenuProvider.java (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ObjectEditorContextMenuProvider.java Tue Sep 12 04:28:51 2006
@@ -49,10 +49,9 @@
 	 */
 	public ObjectEditorContextMenuProvider(EditPartViewer viewer, ActionRegistry registry) {
 		super(viewer);
-		if (registry == null) {
+		if (registry == null)
 			throw new IllegalArgumentException();
-		}
-		actionRegistry = registry;
+		this.actionRegistry = registry;
 	}
 	
 	/**
@@ -114,6 +113,6 @@
 	}
 	
 	private IAction getAction(String actionId) {
-		return actionRegistry.getAction(actionId);
+		return this.actionRegistry.getAction(actionId);
 	}
 }

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?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- 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 Tue Sep 12 04:28:51 2006
@@ -57,7 +57,7 @@
 	 * objects in this editor comes.
 	 */
 	public String getName() {
-		return serverAddress;
+		return this.serverAddress;
 	}
 
 	public IPersistableElement getPersistable() {
@@ -69,7 +69,7 @@
 	 * to be used as a tooltip.
 	 */
 	public String getToolTipText() {
-		return serverAddress + " : " + context.hashCode();
+		return this.serverAddress + " : " + this.context.hashCode();
 	}
 
 	public Object getAdapter(Class adapter) {
@@ -89,13 +89,13 @@
 	 * @return the context used by persistent objects in this editor
 	 */
 	public ObjectContext getContext() {
-		return context;
+		return this.context;
 	}
 
 	/**
 	 * @return the address of the server from which the context comes
 	 */
 	public String getServerAddress() {
-		return serverAddress;
+		return this.serverAddress;
 	}
 }

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ROPBrowserPlugin.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ROPBrowserPlugin.java?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ROPBrowserPlugin.java (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ROPBrowserPlugin.java Tue Sep 12 04:28:51 2006
@@ -56,7 +56,7 @@
 	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
-		boldFont = new Font(null, "Arial", 9, SWT.BOLD);
+		this.boldFont = new Font(null, "Arial", 9, SWT.BOLD);
 		getImageRegistry().put(IMG_DROP_OPEN, ROPBrowserPlugin.getImageDescriptor("icons/" + IMG_DROP_OPEN));
 		getImageRegistry().put(IMG_DROP_CLOSED, ROPBrowserPlugin.getImageDescriptor("icons/" + IMG_DROP_CLOSED));
 	}
@@ -67,7 +67,7 @@
 	@Override
 	public void stop(BundleContext context) throws Exception {
 		super.stop(context);
-		boldFont.dispose();
+		this.boldFont.dispose();
 		plugin = null;
 	}
 
@@ -90,6 +90,6 @@
 	}
 	
 	public Font getBoldFont() {
-		return boldFont;
+		return this.boldFont;
 	}
 }

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/DeleteAction.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/DeleteAction.java?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/DeleteAction.java (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/DeleteAction.java Tue Sep 12 04:28:51 2006
@@ -55,7 +55,7 @@
 		setId(ID);
 		setText("Delete");
 		setToolTipText("Remove the current object from this element and delete it from the database");
-		request = new Request(DELETE_REQUEST);
+		this.request = new Request(DELETE_REQUEST);
 	}
 
 	/**
@@ -70,12 +70,10 @@
 		List parts = getSelectedObjects();
 		for (int i=0; i<parts.size(); i++){
 			Object o = parts.get(i);
-			if (!(o instanceof SingleEditPart || o instanceof CollectionEditPart)) {
+			if (!(o instanceof SingleEditPart || o instanceof CollectionEditPart))
 				return false;
-			}
-			if (((ModelElement) ((ElementEditPart) o).getModel()).isNull()) {
+			if (((ModelElement) ((ElementEditPart) o).getModel()).isNull())
 				return false;
-			}
 		}
 		return true;
 	}
@@ -93,7 +91,7 @@
 		CompoundCommand cc = new CompoundCommand();
 		for (int i=0; i < editparts.size(); i++) {
 			EditPart part = (EditPart)editparts.get(i);
-			cc.add(part.getCommand(request));
+			cc.add(part.getCommand(this.request));
 		}
 		return cc;
 	}

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?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- 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 Tue Sep 12 04:28:51 2006
@@ -72,7 +72,7 @@
 		super(part);
 		setId(ID);
 		setText("Insert existing object...");
-		request = new ExistingObjectRequest();
+		this.request = new ExistingObjectRequest();
 		this.context = context;
 	}
 
@@ -89,19 +89,17 @@
 		List parts = getSelectedObjects();
 		for (int i=0; i<parts.size(); i++){
 			Object o = parts.get(i);
-			if (!(o instanceof CollectionEditPart) && !(o instanceof SingleEditPart)) {
+			if (!(o instanceof CollectionEditPart) && !(o instanceof SingleEditPart))
 				return false;
-			}
 			
 			// ensure that they all have the same entity name
 			// as a single object will be insert into all of them
 			ModelElement element = (ModelElement) ((ElementEditPart) o).getModel();
 			if (i == 0) {
-				entityName = element.getName(); 
+				this.entityName = element.getName(); 
 			}
-			else if (!element.getName().equals(entityName)) {
+			else if (!element.getName().equals(this.entityName))
 				return false;
-			}
 		}
 		return true;
 	}
@@ -112,11 +110,11 @@
 	 */
 	@Override
 	public void run() {
-		SelectQueryWizard wizard = new SelectQueryWizard(context, entityName, SelectQueryWizard.RETURN_OBJECT);
+		SelectQueryWizard wizard = new SelectQueryWizard(this.context, this.entityName, SelectQueryWizard.RETURN_OBJECT);
 		WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard);
 		dialog.create();
 		if (dialog.open() == WizardDialog.OK) {
-			request.setSelectedObject(wizard.getSelectedObject());
+			this.request.setSelectedObject(wizard.getSelectedObject());
 			execute(getCommand());
 		}
 	}
@@ -129,7 +127,7 @@
 		CompoundCommand cc = new CompoundCommand();
 		for (int i=0; i < editparts.size(); i++) {
 			EditPart part = (EditPart)editparts.get(i);
-			cc.add(part.getCommand(request));
+			cc.add(part.getCommand(this.request));
 		}
 		return cc;
 	}

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/HideAction.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/HideAction.java?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/HideAction.java (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/HideAction.java Tue Sep 12 04:28:51 2006
@@ -51,7 +51,7 @@
 		super(part);
 		setId(ID);
 		setText("Hide");
-		request = new Request(HIDE_REQUEST);
+		this.request = new Request(HIDE_REQUEST);
 	}
 
 	/**
@@ -65,9 +65,8 @@
 		List parts = getSelectedObjects();
 		for (int i=0; i<parts.size(); i++){
 			Object o = parts.get(i);
-			if (!(o instanceof ElementEditPart)) {
+			if (!(o instanceof ElementEditPart))
 				return false;
-			}
 		}
 		return true;
 	}
@@ -85,7 +84,7 @@
 		CompoundCommand cc = new CompoundCommand();
 		for (int i=0; i < editparts.size(); i++) {
 			EditPart part = (EditPart)editparts.get(i);
-			cc.add(part.getCommand(request));
+			cc.add(part.getCommand(this.request));
 		}
 		return cc;
 	}

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/InsertAction.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/InsertAction.java?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/InsertAction.java (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/InsertAction.java Tue Sep 12 04:28:51 2006
@@ -53,7 +53,7 @@
 		super(part);
 		setId(ID);
 		setText("Insert new object");
-		request = new Request(INSERT_REQUEST);
+		this.request = new Request(INSERT_REQUEST);
 	}
 
 	/**
@@ -68,12 +68,10 @@
 		List parts = getSelectedObjects();
 		for (int i=0; i<parts.size(); i++){
 			Object o = parts.get(i);
-			if (!(o instanceof CollectionEditPart) && !(o instanceof SingleEditPart)) {
+			if (!(o instanceof CollectionEditPart) && !(o instanceof SingleEditPart))
 				return false;
-			}
-			if ((o instanceof SingleEditPart) && !(((SingleModelElement) ((SingleEditPart) o).getModel()).isNull())) {
+			if ((o instanceof SingleEditPart) && !(((SingleModelElement) ((SingleEditPart) o).getModel()).isNull()))
 				return false;
-			}
 		}
 		return true;
 	}
@@ -91,7 +89,7 @@
 		CompoundCommand cc = new CompoundCommand();
 		for (int i=0; i < editparts.size(); i++) {
 			EditPart part = (EditPart)editparts.get(i);
-			cc.add(part.getCommand(request));
+			cc.add(part.getCommand(this.request));
 		}
 		return cc;
 	}

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?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- 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 Tue Sep 12 04:28:51 2006
@@ -16,7 +16,6 @@
 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;

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/RemoveAction.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/RemoveAction.java?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/RemoveAction.java (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/RemoveAction.java Tue Sep 12 04:28:51 2006
@@ -53,7 +53,7 @@
 		setId(ID);
 		setText("Remove object");
 		setToolTipText("Remove the current object from this element without deleting it");
-		request = new Request(REMOVE_REQUEST);
+		this.request = new Request(REMOVE_REQUEST);
 	}
 
 	/**
@@ -68,12 +68,10 @@
 		List parts = getSelectedObjects();
 		for (int i=0; i<parts.size(); i++){
 			Object o = parts.get(i);
-			if (!(o instanceof ElementEditPart)) {
+			if (!(o instanceof ElementEditPart))
 				return false;
-			}
-			if (((ModelElement) ((ElementEditPart) o).getModel()).isNull()) {
+			if (((ModelElement) ((ElementEditPart) o).getModel()).isNull())
 				return false;
-			}
 		}
 		return true;
 	}
@@ -91,7 +89,7 @@
 		CompoundCommand cc = new CompoundCommand();
 		for (int i=0; i < editparts.size(); i++) {
 			EditPart part = (EditPart)editparts.get(i);
-			cc.add(part.getCommand(request));
+			cc.add(part.getCommand(this.request));
 		}
 		return cc;
 	}

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/RollbackAction.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/RollbackAction.java?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/RollbackAction.java (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/RollbackAction.java Tue Sep 12 04:28:51 2006
@@ -50,11 +50,11 @@
 	 * @return true if the editor is dirty
 	 */
 	public boolean calculateEnabled() {
-		return editor.isDirty();
+		return this.editor.isDirty();
 	}
 	
 	@Override
 	public void run() {
-		editor.getDiagram().rollbackChanges();
+		this.editor.getDiagram().rollbackChanges();
 	}
 }

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/SetNameAction.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/SetNameAction.java?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/SetNameAction.java (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/actions/SetNameAction.java Tue Sep 12 04:28:51 2006
@@ -49,7 +49,7 @@
 		super(part);
 		setId(ID);
 		setText("Set name");
-		request = new SetNameElementRequest();
+		this.request = new SetNameElementRequest();
 	}
 
 	/**
@@ -62,12 +62,10 @@
 			return false;
 		List parts = getSelectedObjects();
 		Object o = parts.get(0);
-		if (!(o instanceof ElementEditPart)) {
+		if (!(o instanceof ElementEditPart))
 			return false;
-		}
-		if (((ModelElement) ((ElementEditPart) o).getModel()).isRoot()) {
+		if (((ModelElement) ((ElementEditPart) o).getModel()).isRoot())
 			return true;
-		}
 		return false;
 	}
 	
@@ -81,7 +79,7 @@
 		int result = iDialog.open();
 		if (result == InputDialog.OK) {
 			String newName = iDialog.getValue();
-			request.setName(newName);
+			this.request.setName(newName);
 			execute(getCommand());
 		}
 	}
@@ -92,6 +90,6 @@
 	private Command getCommand() {
 		List editparts = getSelectedObjects();
 		EditPart part = (EditPart)editparts.get(0);
-		return part.getCommand(request);
+		return part.getCommand(this.request);
 	}
 }

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?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- 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 Tue Sep 12 04:28:51 2006
@@ -47,6 +47,6 @@
 	
 	@Override
 	public void run() {
-		editor.getDiagram().toggleAutoLayout();
+		this.editor.getDiagram().toggleAutoLayout();
 	}
 }

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ContractRelationshipCommand.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ContractRelationshipCommand.java?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ContractRelationshipCommand.java (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ContractRelationshipCommand.java Tue Sep 12 04:28:51 2006
@@ -62,18 +62,18 @@
 	
 	@Override
 	public void redo() {
-		conn.disconnect();
-		if (!conn.getTarget().isConnectedToRoot()) {
-			hideCommand = new HideElementCommand(conn.getTarget());
-			hideCommand.execute();
+		this.conn.disconnect();
+		if (!this.conn.getTarget().isConnectedToRoot()) {
+			this.hideCommand = new HideElementCommand(this.conn.getTarget());
+			this.hideCommand.execute();
 		}
 	}
 	
 	@Override
 	public void undo() {
-		conn.connect();
-		if (hideCommand != null) {
-			hideCommand.undo();
+		this.conn.connect();
+		if (this.hideCommand != null) {
+			this.hideCommand.undo();
 		}
 	}
 }

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/DeleteObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/DeleteObjectCommand.java?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/DeleteObjectCommand.java (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/DeleteObjectCommand.java Tue Sep 12 04:28:51 2006
@@ -36,9 +36,8 @@
 	 * @throws IllegalArgumentException if any parameter is null
 	 */
 	public DeleteObjectCommand(ModelElement element) {
-		if (element == null) {
+		if (element == null)
 			throw new IllegalArgumentException();
-		}
 		setLabel("delete");
 		this.element = element;
 	}
@@ -50,11 +49,11 @@
 	
 	@Override
 	public boolean canExecute() {
-		return !element.isNull();
+		return !this.element.isNull();
 	}
 	
 	@Override
 	public void execute() {
-		element.deleteCurrentObject();
+		this.element.deleteCurrentObject();
 	}
 }

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ElementSetConstraintCommand.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ElementSetConstraintCommand.java?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ElementSetConstraintCommand.java (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ElementSetConstraintCommand.java Tue Sep 12 04:28:51 2006
@@ -62,12 +62,12 @@
 	
 	@Override
 	public void redo() {
-		element.modifyBounds(newBounds);
+		this.element.modifyBounds(this.newBounds);
 	}
 
 	@Override
 	public void undo()
 	{
-		element.modifyBounds(oldBounds);
+		this.element.modifyBounds(this.oldBounds);
 	}
 }

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ExistingObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ExistingObjectCommand.java?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ExistingObjectCommand.java (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ExistingObjectCommand.java Tue Sep 12 04:28:51 2006
@@ -16,8 +16,6 @@
 package org.apache.cayenne.ropbrowser.commands;
 
 import java.util.ArrayList;
-import java.util.Collection;
-
 import org.apache.cayenne.ropbrowser.model.AbstractObject;
 import org.apache.cayenne.ropbrowser.model.CollectionModelElement;
 import org.apache.cayenne.ropbrowser.model.Connection;
@@ -57,9 +55,8 @@
 	 * @throws IllegalArgumentException if any parameter is null
 	 */
 	public ExistingObjectCommand(ModelElement element, AbstractObject object) {
-		if (element == null) {
+		if (element == null)
 			throw new IllegalArgumentException();
-		}
 		setLabel("insert existing object");
 		this.element = element;
 		this.object = object;
@@ -67,12 +64,12 @@
 	
 	@Override
 	public boolean canUndo() {
-		return !(element instanceof CollectionModelElement);
+		return !(this.element instanceof CollectionModelElement);
 	}
 	
 	@Override
 	public boolean canExecute() {
-		return !element.contains(object);
+		return !this.element.contains(this.object);
 	}
 	
 	@Override
@@ -82,21 +79,21 @@
 	
 	@Override
 	public void redo() {
-		replacingConnections = new ArrayList<RelationshipConnection>();
-		replacedConnections = new ArrayList<RelationshipConnection>();
+		this.replacingConnections = new ArrayList<RelationshipConnection>();
+		this.replacedConnections = new ArrayList<RelationshipConnection>();
 		
-		if (element instanceof CollectionModelElement) {
-			element.addObject(object);
-			((CollectionModelElement) element).setCurrentObject(object);
+		if (this.element instanceof CollectionModelElement) {
+			this.element.addObject(this.object);
+			((CollectionModelElement) this.element).setCurrentObject(this.object);
 		}
-		else if (element instanceof SingleModelElement) {
-			replacingElement = element.getDiagram().getSingleElementForObject(object);
-			replacedObject = element.getCurrentObject();
-			if (replacingElement == null) { // no existing element - just set this one up
-				element.addObject(object);
+		else if (this.element instanceof SingleModelElement) {
+			this.replacingElement = this.element.getDiagram().getSingleElementForObject(this.object);
+			this.replacedObject = this.element.getCurrentObject();
+			if (this.replacingElement == null) { // no existing element - just set this one up
+				this.element.addObject(this.object);
 				
 				// contract relationships because they may no longer be accurate
-				for (Connection conn : element.getSourceConnections()) {
+				for (Connection conn : this.element.getSourceConnections()) {
 					if (conn instanceof RelationshipConnection) {
 						Command conCommand = new ContractRelationshipCommand((RelationshipConnection) conn);
 						conCommand.execute();
@@ -104,24 +101,24 @@
 				}
 			}
 			else { // a single model element with this object already exists; link to it
-				for (Connection conn : element.getTargetConnections()) {
+				for (Connection conn : this.element.getTargetConnections()) {
 					if (conn instanceof RelationshipConnection) {
 						RelationshipConnection relConn = (RelationshipConnection) conn;
-						relConn.getSource().getCurrentObject().setRelationship(relConn.getRelationship(), element.getCurrentObject(), object);
+						relConn.getSource().getCurrentObject().setRelationship(relConn.getRelationship(), this.element.getCurrentObject(), this.object);
 						relConn.disconnect();
-						RelationshipConnection newConn = new RelationshipConnection(relConn.getSource(), replacingElement, relConn.getRelationship());
+						RelationshipConnection newConn = new RelationshipConnection(relConn.getSource(), this.replacingElement, relConn.getRelationship());
 						newConn.connect();
-						replacedConnections.add(relConn);
-						replacingConnections.add(newConn);
+						this.replacedConnections.add(relConn);
+						this.replacingConnections.add(newConn);
 					}
 				}
 				
 				// hide the old element - it is no longer needed
-				HideElementCommand recCommand = new HideElementCommand(element);
+				HideElementCommand recCommand = new HideElementCommand(this.element);
 				recCommand.execute();
 				
 				// contract relationships because they may no longer be accurate
-				for (Connection conn : replacingElement.getSourceConnections()) {
+				for (Connection conn : this.replacingElement.getSourceConnections()) {
 					if (conn instanceof RelationshipConnection) { // this should always be true
 						Command conCommand = new ContractRelationshipCommand((RelationshipConnection) conn);
 						conCommand.execute();
@@ -146,17 +143,17 @@
 			element.removeObject(object);
 		}
 		*/
-		if (element instanceof SingleModelElement) {
-			if (replacingElement == null) { // the element wasn't replaced
-				element.addObject(replacedObject);
+		if (this.element instanceof SingleModelElement) {
+			if (this.replacingElement == null) { // the element wasn't replaced
+				this.element.addObject(this.replacedObject);
 			}
 			else { // the element was replaced with an existing element
-				element.getDiagram().addElement(element);
-				for (RelationshipConnection newConn : replacingConnections) {
-					newConn.getSource().getCurrentObject().setRelationship(newConn.getRelationship(), replacingElement.getCurrentObject(), replacedObject);
+				this.element.getDiagram().addElement(this.element);
+				for (RelationshipConnection newConn : this.replacingConnections) {
+					newConn.getSource().getCurrentObject().setRelationship(newConn.getRelationship(), this.replacingElement.getCurrentObject(), this.replacedObject);
 					newConn.disconnect();
 				}
-				for (RelationshipConnection relConn : replacedConnections) {
+				for (RelationshipConnection relConn : this.replacedConnections) {
 					relConn.connect();
 				}				
 			}

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ExistingObjectRequest.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ExistingObjectRequest.java?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ExistingObjectRequest.java (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/ExistingObjectRequest.java Tue Sep 12 04:28:51 2006
@@ -37,7 +37,7 @@
 	}
 
 	public AbstractObject getSelectedObject() {
-		return selectedObject;
+		return this.selectedObject;
 	}
 
 	public void setSelectedObject(AbstractObject selectedObject) {

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?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- 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 Tue Sep 12 04:28:51 2006
@@ -49,9 +49,8 @@
 	 * @throws IllegalArgumentException if any parameter is null
 	 */
 	public ExpandRelationshipCommand(SingleModelElement source, Relationship relationship) throws IllegalArgumentException {
-		if (source == null || relationship == null) {
-			throw new IllegalArgumentException();
-		}		
+		if (source == null || relationship == null)
+			throw new IllegalArgumentException();		
 		this.relationship = relationship;
 		this.source = source;
 		setLabel("expand relationship");
@@ -69,35 +68,35 @@
 	
 	@Override
 	public void redo() {
-		Object value = source.getCurrentObject().followRelationship(relationship);
+		Object value = this.source.getCurrentObject().followRelationship(this.relationship);
 		
 		// create the element and set its contents
 		
 		ModelElement newElement;
 		
-		if (relationship.isToMany()) {
-			newElement = new CollectionModelElement(relationship.getTargetEntityName());
+		if (this.relationship.isToMany()) {
+			newElement = new CollectionModelElement(this.relationship.getTargetEntityName());
 		}
 		else {
-			newElement = new SingleModelElement(relationship.getTargetEntityName());
+			newElement = new SingleModelElement(this.relationship.getTargetEntityName());
 		}
 		
 		newElement.setObject(value);
 		
-		if (source.getDiagram().addElement(newElement)) {
+		if (this.source.getDiagram().addElement(newElement)) {
 			// no such element exists; the new element has been added into the diagram
-			conn = new RelationshipConnection(source, newElement, relationship);
+			this.conn = new RelationshipConnection(this.source, newElement, this.relationship);
 		}
 		else {
 			// the element exists; just connect it in a relationship to this one
-			conn = new RelationshipConnection(source, source.getDiagram().getElement(newElement), relationship);
+			this.conn = new RelationshipConnection(this.source, this.source.getDiagram().getElement(newElement), this.relationship);
 		} 
-		conn.connect();
+		this.conn.connect();
 	}
 	
 	@Override
 	public void undo() {
-		Command contractCommand = new ContractRelationshipCommand(conn);
+		Command contractCommand = new ContractRelationshipCommand(this.conn);
 		contractCommand.execute();
 	}
 }

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/HideElementCommand.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/HideElementCommand.java?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/HideElementCommand.java (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/HideElementCommand.java Tue Sep 12 04:28:51 2006
@@ -56,9 +56,8 @@
 	 * @throws IllegalArgumentException if any parameter is null
 	 */
 	public HideElementCommand(ModelElement element) {
-		if (element == null) {
+		if (element == null)
 			throw new IllegalArgumentException();
-		}
 		setLabel("hide element");
 		this.element = element;
 	}
@@ -70,27 +69,27 @@
 	
 	@Override
 	public void execute() {
-		sourceConnections = element.getSourceConnections();
-		targetConnections = element.getTargetConnections();
+		this.sourceConnections = this.element.getSourceConnections();
+		this.targetConnections = this.element.getTargetConnections();
 		redo();
 	}
 	
 	@Override
 	public void redo() {
-		subcommands = new ArrayList<Command>();
+		this.subcommands = new ArrayList<Command>();
 		
 		// disconnect all connections to and from this element
-		for (Connection conn : element.getTargetConnections()) {
+		for (Connection conn : this.element.getTargetConnections()) {
 			conn.disconnect(); 
 		}
 		
-		for (Connection conn : element.getSourceConnections()) {
+		for (Connection conn : this.element.getSourceConnections()) {
 			conn.disconnect();
 			
 			// hide any elements which are no longer connected to the root
 			if (!conn.getTarget().isConnectedToRoot()) {
 				Command recCommand = new HideElementCommand(conn.getTarget());
-				subcommands.add(recCommand);
+				this.subcommands.add(recCommand);
 				recCommand.execute();
 			}
 			
@@ -98,30 +97,30 @@
 		
 		// remove the element from the diagram
 		
-		element.getDiagram().removeElement(element);
+		this.element.getDiagram().removeElement(this.element);
 		
 	}
 	
 	@Override
 	public void undo() {
 		// restore all the elements which were hidden by subcommands
-		for (Command command : subcommands) {
+		for (Command command : this.subcommands) {
 			command.undo();
 		}
 		
 		// reconnect the hidden elements connections
-		for (Connection conn : sourceConnections) {
+		for (Connection conn : this.sourceConnections) {
 			if (conn instanceof RelationshipConnection) {
 				conn.connect();
 			}
 		}
-		for (Connection conn : targetConnections) {
+		for (Connection conn : this.targetConnections) {
 			if (conn instanceof RelationshipConnection) {
 				conn.connect();
 			}
 		}
 		
 		// add the element back into the diagram
-		element.getDiagram().addElement(element);
+		this.element.getDiagram().addElement(this.element);
 	}
 }

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/NextObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/NextObjectCommand.java?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/NextObjectCommand.java (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/NextObjectCommand.java Tue Sep 12 04:28:51 2006
@@ -48,11 +48,11 @@
 	
 	@Override
 	public void redo() {
-		element.next();
+		this.element.next();
 	}
 	
 	@Override
 	public void undo() {
-		element.previous();
+		this.element.previous();
 	}
 }

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?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- 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 Tue Sep 12 04:28:51 2006
@@ -38,9 +38,8 @@
 	 * @throws IllegalArgumentException if any parameter is null
 	 */
 	public ObjectInsertCommand(ModelElement element) {
-		if (element == null) {
+		if (element == null)
 			throw new IllegalArgumentException();
-		}
 		setLabel("insert object");
 		this.element = element;
 	}
@@ -52,19 +51,19 @@
 	
 	@Override
 	public void redo() {
-		ObjEntity entity = element.getDiagram().getObjectContext().getEntityResolver().getObjEntity(element.getName());
+		ObjEntity entity = this.element.getDiagram().getObjectContext().getEntityResolver().getObjEntity(this.element.getName());
 		Class entityClass = entity.getJavaClass();
-		object = (AbstractObject) element.getDiagram().getObjectContext().newObject(entityClass);
-		element.addObject(object);
-		if (element instanceof CollectionModelElement) {
-			((CollectionModelElement) element).setCurrentObject(object);
+		this.object = (AbstractObject) this.element.getDiagram().getObjectContext().newObject(entityClass);
+		this.element.addObject(this.object);
+		if (this.element instanceof CollectionModelElement) {
+			((CollectionModelElement) this.element).setCurrentObject(this.object);
 		}
 	}
 	
 	@Override
 	public void undo() {
-		element.removeObject(object);
-		object.getObjectContext().deleteObject(object);
+		this.element.removeObject(this.object);
+		this.object.getObjectContext().deleteObject(this.object);
 	}
 	
 	@Override

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/PopOutCommand.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/PopOutCommand.java?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/PopOutCommand.java (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/PopOutCommand.java Tue Sep 12 04:28:51 2006
@@ -51,7 +51,7 @@
 	
 	@Override
 	public boolean canExecute() {
-		return !element.isNull();
+		return !this.element.isNull();
 	}
 	
 	@Override
@@ -61,16 +61,16 @@
 	
 	@Override
 	public void redo() {
-		if (newElement == null) {
-			newElement = new SingleModelElement(element.getName());
-			newElement.setObject(element.getCurrentObject());
+		if (this.newElement == null) {
+			this.newElement = new SingleModelElement(this.element.getName());
+			this.newElement.setObject(this.element.getCurrentObject());
 		}
-		element.getDiagram().addElement(newElement);
+		this.element.getDiagram().addElement(this.newElement);
 	}
 	
 	@Override
 	public void undo() {
-		Command hideCommand = new HideElementCommand(newElement);
+		Command hideCommand = new HideElementCommand(this.newElement);
 		hideCommand.execute();
 	}
 }

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/RemoveObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/RemoveObjectCommand.java?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/RemoveObjectCommand.java (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/RemoveObjectCommand.java Tue Sep 12 04:28:51 2006
@@ -37,9 +37,8 @@
 	 * @throws IllegalArgumentException if any parameter is null
 	 */
 	public RemoveObjectCommand(ModelElement element) {
-		if (element == null) {
+		if (element == null)
 			throw new IllegalArgumentException();
-		}
 		setLabel("remove from collection");
 		this.element = element;
 	}
@@ -56,12 +55,12 @@
 	
 	@Override
 	public void redo() {
-		removed = element.getCurrentObject();
-		element.removeObject(removed);
+		this.removed = this.element.getCurrentObject();
+		this.element.removeObject(this.removed);
 	}
 	
 	@Override
 	public void undo() {
-		element.addObject(removed);
+		this.element.addObject(this.removed);
 	}
 }

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/SetNameElementCommand.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/SetNameElementCommand.java?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/SetNameElementCommand.java (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/SetNameElementCommand.java Tue Sep 12 04:28:51 2006
@@ -44,9 +44,8 @@
 	 * @throws IllegalArgumentException if element is null
 	 */
 	public SetNameElementCommand(ModelElement element, String name) {
-		if (element == null) {
+		if (element == null)
 			throw new IllegalArgumentException();
-		}
 		setLabel("set name");
 		this.element = element;
 		this.newName = name;
@@ -59,17 +58,17 @@
 	
 	@Override
 	public void execute() {
-		oldName = element.getName();
+		this.oldName = this.element.getName();
 		redo();
 	}
 	
 	@Override
 	public void redo() {
-		element.setName(newName);
+		this.element.setName(this.newName);
 	}
 	
 	@Override
 	public void undo() {
-		element.setName(oldName);
+		this.element.setName(this.oldName);
 	}
 }

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/SetNameElementRequest.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/SetNameElementRequest.java?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/SetNameElementRequest.java (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/commands/SetNameElementRequest.java Tue Sep 12 04:28:51 2006
@@ -36,7 +36,7 @@
 	}
 
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	public void setName(String name) {

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?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- 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 Tue Sep 12 04:28:51 2006
@@ -25,7 +25,6 @@
 import org.eclipse.draw2d.ActionListener;
 import org.eclipse.draw2d.Button;
 import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.MarginBorder;
 import org.eclipse.draw2d.ToolbarLayout;
 import org.apache.cayenne.map.Attribute;
@@ -52,32 +51,32 @@
 	protected void addComponents() {
 		super.addComponents();
 		
-		navFigure = new DropdownFigure(this);
+		this.navFigure = new DropdownFigure(this);
 		ToolbarLayout layout = new ToolbarLayout();
 		layout.setMinorAlignment(ToolbarLayout.ALIGN_TOPLEFT);
 		layout.setStretchMinorAxis(false);
 		layout.setSpacing(1);
-		navFigure.setLayoutManager(layout);
-		navFigure.setBorder(null);
+		this.navFigure.setLayoutManager(layout);
+		this.navFigure.setBorder(null);
 	}
 	
 	@Override
 	protected void setBackgroundColour() {
 		// root figure should be a different colour
 		if (getElementCast().isRoot()) {
-			name.setBackgroundColor(ColorConstants.lightBlue);
+			this.name.setBackgroundColor(ColorConstants.lightBlue);
 		}
 		else {
-			name.setBackgroundColor(ColorConstants.yellow);
+			this.name.setBackgroundColor(ColorConstants.yellow);
 		}
 	}
 
 	CollectionModelElement getElementCast() {
-		return (CollectionModelElement) part.getModel();
+		return (CollectionModelElement) this.part.getModel();
 	}
 	
 	CollectionEditPart getPartCast() {
-		return (CollectionEditPart) part;
+		return (CollectionEditPart) this.part;
 	}
 	
 	@Override
@@ -88,10 +87,10 @@
 		CollectionModelElement element = getElementCast();
 		String modelName = element.getName();
 		if (modelName != null) {
-			name.setText(modelName + " (" + element.getPropertyValue(CollectionModelElement.PROP_TOTAL_RECORDS) + ")");
+			this.name.setText(modelName + " (" + element.getPropertyValue(CollectionModelElement.PROP_TOTAL_RECORDS) + ")");
 		}
 		else {
-			name.setText(MSG_NULL_RESULT);
+			this.name.setText(MSG_NULL_RESULT);
 		}
 	}
 	
@@ -104,7 +103,7 @@
 	protected void setAttributes(AbstractObject model) {
 		for (Object child : getAttributeCompartment().getChildren()) {
 			if (child instanceof Button) {
-				((Button) child).removeActionListener(navFigure);
+				((Button) child).removeActionListener(this.navFigure);
 			}
 		}
 		getAttributeCompartment().removeAll();
@@ -123,7 +122,7 @@
 				}
 				
 				// if expanded, use open icon, else closed
-				if (navFigure.isExpanded(a.getName())) {
+				if (this.navFigure.isExpanded(a.getName())) {
 					b = new Button(a.getName() + " : " + attributeValue + " ", ROPBrowserPlugin.getDefault().getImageRegistry().get(ROPBrowserPlugin.IMG_DROP_OPEN));
 				}
 				else {
@@ -134,15 +133,15 @@
 				}
 				b.setBorder(null);
 				b.setOpaque(false);
-				b.addActionListener(navFigure);
+				b.addActionListener(this.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 (navFigure.isExpanded(a.getName())) {
+				if (this.navFigure.isExpanded(a.getName())) {
 					Iterator<AbstractObject> iterator = getElementCast().getSortedObjectIterator(a.getName());
-					navFigure.populateDropdown(getPartCast(), iterator);
+					this.navFigure.populateDropdown(getPartCast(), iterator);
 				}
 			}	
 		}
@@ -178,7 +177,7 @@
 		while (iterator.hasNext()) {
 			AbstractObject o = iterator.next();
 			// label the button with the attribute's value for this object
-			String attributeValue = o.getPropertyValue(lastNavAttribute);
+			String attributeValue = o.getPropertyValue(this.lastNavAttribute);
 			Button b;
 			if (attributeValue != null) {
 				if (attributeValue.length() > ElementFigure.MAX_ATTRIBUTE_LENGTH) {
@@ -199,7 +198,7 @@
 			add(b);
 		}
 		
-		collection.add(this);
+		this.collection.getAttributeCompartment().add(this);
 	}
 	
 	/**
@@ -213,21 +212,24 @@
 		Button buttonPressed = (Button) event.getSource();
 		String pressed = (String) buttonPressed.getModel().getUserData();
 		
-		if (lastNavAttribute != null && lastNavAttribute.equals(pressed)) {
-			lastNavAttribute = null;
-			getParent().remove(this);
+		if (this.lastNavAttribute == null) {
+			this.lastNavAttribute = pressed;
+		}
+		else if (this.lastNavAttribute.equals(pressed)) {
+			this.lastNavAttribute = null;
+			this.collection.getAttributeCompartment().remove(this);
 		}
 		else {
-			lastNavAttribute = pressed;
+			this.lastNavAttribute = pressed;
+			this.collection.getAttributeCompartment().remove(this);
 		}
-		
-		collection.refresh();
+				
+		this.collection.refresh();
 	}
 	
 	public boolean isExpanded(String attributeName) {
-		if (lastNavAttribute == null) {
+		if (this.lastNavAttribute == null)
 			return false;
-		}
-		return lastNavAttribute.equals(attributeName);
+		return this.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?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- 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 Tue Sep 12 04:28:51 2006
@@ -27,7 +27,6 @@
 import org.eclipse.draw2d.Label;
 import org.eclipse.draw2d.LineBorder;
 import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.swt.widgets.Display;
 import org.apache.cayenne.map.Attribute;
 
 /**
@@ -70,12 +69,12 @@
 	 * Extended by subclasses to add their specific compartments.
 	 */
 	protected void addComponents() {
-		name = new Label();
-		add(name);
-		name.setOpaque(true);
-		name.setFont(ROPBrowserPlugin.getDefault().getBoldFont());
+		this.name = new Label();
+		add(this.name);
+		this.name.setOpaque(true);
+		this.name.setFont(ROPBrowserPlugin.getDefault().getBoldFont());
 		
-		add(attributeFigure);
+		add(this.attributeFigure);
 	}
 	
 	/**
@@ -92,7 +91,7 @@
 	 * @return the sub-figure which contains the displayed object's attributes
 	 */
 	public CompartmentFigure getAttributeCompartment() {
-		return attributeFigure;
+		return this.attributeFigure;
 	}
 
 	/**
@@ -125,6 +124,6 @@
 	 */
 	public void refresh() {
 		setName();
-		setAttributes(((ModelElement) part.getModel()).getCurrentObject());
+		setAttributes(((ModelElement) this.part.getModel()).getCurrentObject());
 	}
 }

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?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- 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 Tue Sep 12 04:28:51 2006
@@ -22,7 +22,6 @@
 import org.eclipse.draw2d.ColorConstants;
 import org.eclipse.draw2d.CompoundBorder;
 import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.swt.widgets.Display;
 import org.apache.cayenne.map.Relationship;
 
 /**
@@ -51,10 +50,10 @@
 		
 		if (getElementCast().getCurrentObject() != null &&
 				getElementCast().getCurrentObject().isDeleted()) {
-			name.setBackgroundColor(ColorConstants.red);
+			this.name.setBackgroundColor(ColorConstants.red);
 		}
 		else {
-			name.setBackgroundColor(ColorConstants.green);
+			this.name.setBackgroundColor(ColorConstants.green);
 		}
 	}
 
@@ -62,15 +61,15 @@
 	protected void addComponents() {
 		super.addComponents();
 		
-		relationshipFigure = new CompartmentFigure();
-		add(relationshipFigure);
+		this.relationshipFigure = new CompartmentFigure();
+		add(this.relationshipFigure);
 	}
 	
 	/**
 	 * @return the sub-figure which contains the displayed object's relationships
 	 */
 	public CompartmentFigure getRelationshipCompartment() {
-		return relationshipFigure;
+		return this.relationshipFigure;
 	}
 	
 	/**
@@ -78,12 +77,12 @@
 	 * representing the element's relationships
 	 */
 	protected void setRelationships() {
-		for (Object child : relationshipFigure.getChildren()) {
+		for (Object child : this.relationshipFigure.getChildren()) {
 			if (child instanceof Button) {
-				((Button) child).removeActionListener((SingleEditPart) part);
+				((Button) child).removeActionListener((SingleEditPart) this.part);
 			}
 		}
-		relationshipFigure.removeAll();
+		this.relationshipFigure.removeAll();
 		
 		if (getElementCast().getCurrentObject() == null) return;
 		
@@ -95,22 +94,22 @@
 			relButton = new Button(relationship.getName() + " -> " + relationship.getTargetEntityName() + (relationship.isToMany() ? " (1-n)" : " (1-1)"));
 			relButton.setStyle(Clickable.STYLE_TOGGLE);
 			relButton.getModel().setUserData(relationship);
-			relButton.addActionListener((SingleEditPart) part);
-			relButton.setSelected(((SingleEditPart) part).isRelationshipExpanded(relationship));
+			relButton.addActionListener((SingleEditPart) this.part);
+			relButton.setSelected(((SingleEditPart) this.part).isRelationshipExpanded(relationship));
 			relButton.setOpaque(true);
 			relButton.setBackgroundColor(ColorConstants.button);
 			relButton.setBorder(new CompoundBorder(relButton.getBorder(), new MarginBorder(1)));
-			relationshipFigure.add(relButton);
+			this.relationshipFigure.add(relButton);
 		}
 	}
 	
 	private SingleModelElement getElementCast() {
-		return (SingleModelElement) part.getModel();
+		return (SingleModelElement) this.part.getModel();
 	}
 	
 	@Override
 	protected void setName() {
-		name.setText(getElementCast().getName());
+		this.name.setText(getElementCast().getName());
 	}
 	
 	@Override

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/layout/DelegatingLayoutManager.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/layout/DelegatingLayoutManager.java?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/layout/DelegatingLayoutManager.java (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/layout/DelegatingLayoutManager.java Tue Sep 12 04:28:51 2006
@@ -57,53 +57,53 @@
 
 	public void layout(IFigure container)
 	{
-		if (!diagram.isAutoLayoutDesired())
+		if (!this.diagram.isAutoLayoutDesired())
 		{
-			diagram.setElementFigureBounds(true);
-			setLayoutManager(container, xyLayoutManager);
-			activeLayoutManager.layout(container);
+			this.diagram.setElementFigureBounds(true);
+			setLayoutManager(container, this.xyLayoutManager);
+			this.activeLayoutManager.layout(container);
 		}
 		else
 		{
-			setLayoutManager(container, graphLayoutManager);
-			activeLayoutManager.layout(container);
+			setLayoutManager(container, this.graphLayoutManager);
+			this.activeLayoutManager.layout(container);
 		}
 
 	}
 
 	public Object getConstraint(IFigure child)
 	{
-		return activeLayoutManager.getConstraint(child);
+		return this.activeLayoutManager.getConstraint(child);
 	}
 
 	public Dimension getMinimumSize(IFigure container, int wHint, int hHint)
 	{
-		return activeLayoutManager.getMinimumSize(container, wHint, hHint);
+		return this.activeLayoutManager.getMinimumSize(container, wHint, hHint);
 	}
 
 	public Dimension getPreferredSize(IFigure container, int wHint, int hHint)
 	{
-		return activeLayoutManager.getPreferredSize(container, wHint, hHint);
+		return this.activeLayoutManager.getPreferredSize(container, wHint, hHint);
 	}
 
 	public void invalidate()
 	{
-		activeLayoutManager.invalidate();
+		this.activeLayoutManager.invalidate();
 	}
 
 	public void remove(IFigure child)
 	{
-		activeLayoutManager.remove(child);
+		this.activeLayoutManager.remove(child);
 	}
 
 	public void setConstraint(IFigure child, Object constraint)
 	{
-		activeLayoutManager.setConstraint(child, constraint);
+		this.activeLayoutManager.setConstraint(child, constraint);
 	}
 
 	public void setXYLayoutConstraint(IFigure child, Rectangle constraint)
 	{
-		xyLayoutManager.setConstraint(child, constraint);
+		this.xyLayoutManager.setConstraint(child, constraint);
 	}
 
 	//********************* protected and private methods
@@ -116,19 +116,19 @@
 	{
 		container.setLayoutManager(layoutManager);
 		this.activeLayoutManager = layoutManager;
-		if (layoutManager == xyLayoutManager)
+		if (layoutManager == this.xyLayoutManager)
 		{
-			diagram.installEditPolicy(EditPolicy.LAYOUT_ROLE, new ElementXYLayoutEditPolicy());
+			this.diagram.installEditPolicy(EditPolicy.LAYOUT_ROLE, new ElementXYLayoutEditPolicy());
 		}
 		else
 		{
-			diagram.installEditPolicy(EditPolicy.LAYOUT_ROLE, new SelectionHandlesEditPolicy());
+			this.diagram.installEditPolicy(EditPolicy.LAYOUT_ROLE, new SelectionHandlesEditPolicy());
 		}
 	}
 	
 	public LayoutManager getActiveLayoutManager()
 	{
-		return activeLayoutManager;
+		return this.activeLayoutManager;
 	}
 
 }

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/layout/DirectedGraphLayoutVisitor.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/layout/DirectedGraphLayoutVisitor.java?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/layout/DirectedGraphLayoutVisitor.java (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/layout/DirectedGraphLayoutVisitor.java Tue Sep 12 04:28:51 2006
@@ -54,14 +54,14 @@
 	public void layoutDiagram(ElementDiagramEditPart diagram)
 	{
 
-		partToNodesMap = new HashMap<AbstractGraphicalEditPart, Object>();
+		this.partToNodesMap = new HashMap<AbstractGraphicalEditPart, Object>();
 		
-		graph = new DirectedGraph();
+		this.graph = new DirectedGraph();
 		addNodes(diagram);
-		if (graph.nodes.size() > 0)
+		if (this.graph.nodes.size() > 0)
 		{	
 			addEdges(diagram);
-			new DirectedGraphLayout().visit(graph);
+			new DirectedGraphLayout().visit(this.graph);
 			applyResults(diagram);
 		}
 
@@ -87,8 +87,8 @@
 		n.width = element.getFigure().getPreferredSize(400, 300).width;
 		n.height = element.getFigure().getPreferredSize(400, 300).height;
 		n.setPadding(new Insets(10, 8, 10, 12));
-		partToNodesMap.put(element, n);
-		graph.nodes.add(n);
+		this.partToNodesMap.put(element, n);
+		this.graph.nodes.add(n);
 	}
 
 	protected void addEdges(ElementDiagramEditPart diagram)
@@ -116,12 +116,12 @@
 
 	protected void addEdges(ConnectionEditPart relationshipPart)
 	{
-		Node source = (Node) partToNodesMap.get(relationshipPart.getSource());
-		Node target = (Node) partToNodesMap.get(relationshipPart.getTarget());
+		Node source = (Node) this.partToNodesMap.get(relationshipPart.getSource());
+		Node target = (Node) this.partToNodesMap.get(relationshipPart.getTarget());
 		Edge e = new Edge(relationshipPart, source, target);
 		e.weight = 2;
-		graph.edges.add(e);
-		partToNodesMap.put(relationshipPart, e);
+		this.graph.edges.add(e);
+		this.partToNodesMap.put(relationshipPart, e);
 	}
 
 	//******************* SchemaDiagramPart apply methods **********/
@@ -149,7 +149,7 @@
 	public void applyResults(ElementEditPart element)
 	{
 
-		Node n = (Node) partToNodesMap.get(element);
+		Node n = (Node) this.partToNodesMap.get(element);
 		ElementFigure elementFigure = (ElementFigure) element.getFigure();
 
 		Rectangle bounds = new Rectangle(n.x, n.y, elementFigure.getPreferredSize().width, elementFigure.getPreferredSize().height);

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/layout/GraphLayoutManager.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/layout/GraphLayoutManager.java?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/layout/GraphLayoutManager.java (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/layout/GraphLayoutManager.java Tue Sep 12 04:28:51 2006
@@ -58,7 +58,7 @@
 	
 	public void layout(IFigure container)
 	{
-		new DirectedGraphLayoutVisitor().layoutDiagram(diagram);
-		diagram.setElementModelBounds();
+		new DirectedGraphLayoutVisitor().layoutDiagram(this.diagram);
+		this.diagram.setElementModelBounds();
 	}
 }

Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/layout/GraphXYLayout.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/layout/GraphXYLayout.java?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/layout/GraphXYLayout.java (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/layout/GraphXYLayout.java Tue Sep 12 04:28:51 2006
@@ -33,11 +33,9 @@
 	@Override
 	public Object getConstraint(IFigure child)
 	{
-		Object constraint = constraints.get(child);
+		Object constraint = this.constraints.get(child);
 		if (constraint != null || constraint instanceof Rectangle)
-		{
 			return constraint;
-		}
 		else
 		{
 			Rectangle currentBounds = child.getBounds();

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?view=diff&rev=442563&r1=442562&r2=442563
==============================================================================
--- 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 Tue Sep 12 04:28:51 2006
@@ -18,16 +18,10 @@
 
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Date;
 import java.util.Iterator;
 
-import org.apache.cayenne.ropbrowser.TypeConverter;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.TextPropertyDescriptor;
 import org.apache.cayenne.PersistenceState;
 import org.apache.cayenne.PersistentObject;
 import org.apache.cayenne.map.Attribute;
@@ -36,6 +30,8 @@
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.map.Relationship;
 import org.apache.cayenne.property.ClassDescriptor;
+import org.eclipse.ui.views.properties.IPropertyDescriptor;
+import org.eclipse.ui.views.properties.TextPropertyDescriptor;
 
 /**
  * Base class for all persistent objects, allowing generic access
@@ -65,10 +61,9 @@
 	 * @throws IllegalArgumentException if the parameter is null
 	 */
 	public synchronized void addPropertyChangeListener(PropertyChangeListener l) {
-		if (l == null) {
+		if (l == null)
 			throw new IllegalArgumentException();
-		}
-		pcsDelegate.addPropertyChangeListener(l);
+		this.pcsDelegate.addPropertyChangeListener(l);
 	}
 	
 	/** 
@@ -78,8 +73,8 @@
 	 * @param newValue the new value of this property
 	 */
 	protected void firePropertyChange(String property, Object oldValue, Object newValue) {
-		if (pcsDelegate.hasListeners(property)) {
-			pcsDelegate.firePropertyChange(property, oldValue, newValue);
+		if (this.pcsDelegate.hasListeners(property)) {
+			this.pcsDelegate.firePropertyChange(property, oldValue, newValue);
 		}
 	}
 	
@@ -90,11 +85,11 @@
 	 * a PersistentObject or null for a to-one relationship.
 	 */
 	public Object followRelationship(Relationship rel) {
-		if (objectContext != null) {
-			EntityResolver resolver = objectContext.getEntityResolver();
+		if (this.objectContext != null) {
+			EntityResolver resolver = this.objectContext.getEntityResolver();
 			ClassDescriptor descriptor = resolver.getClassDescriptor(getName());
 			
-			objectContext.prepareForAccess(this, rel.getName());
+			this.objectContext.prepareForAccess(this, rel.getName());
 			
 			Object value = descriptor.getProperty(rel.getName()).readProperty(this);
 			
@@ -107,12 +102,11 @@
 	 * @return a collection of {@link org.apache.cayenne.map.Attribute} objects.
 	 */
 	public Collection getAttributes() {
-		if (attributes != null) {
-			return attributes;
-		}
-		else if (objectContext != null) {
-			attributes = objectContext.getEntityResolver().getObjEntity(getName()).getAttributes();
-			return attributes;
+		if (this.attributes != null)
+			return this.attributes;
+		else if (this.objectContext != null) {
+			this.attributes = this.objectContext.getEntityResolver().getObjEntity(getName()).getAttributes();
+			return this.attributes;
 		}
 		return Collections.EMPTY_LIST;
 	}
@@ -130,7 +124,7 @@
 	 * @return array of IPropertyDescriptors for the objects attributes
 	 */
 	public IPropertyDescriptor[] getPropertyDescriptors() {
-		if (objectContext != null) {
+		if (this.objectContext != null) {
 			EntityResolver entityResolver = getObjectContext().getEntityResolver();
 			ObjEntity entity = entityResolver.getObjEntity(getName());
 			Iterator attributes = entity.getAttributes().iterator();
@@ -151,11 +145,11 @@
 	 * @return the value of the property as a String
 	 */
 	public String getPropertyValue(Object id) {
-		if(objectContext != null) {
+		if(this.objectContext != null) {
 			// prepare the object for access
-            objectContext.prepareForAccess(this, id.toString());
+            this.objectContext.prepareForAccess(this, id.toString());
 		
-			EntityResolver resolver = objectContext.getEntityResolver();
+			EntityResolver resolver = this.objectContext.getEntityResolver();
 			ClassDescriptor descriptor = resolver.getClassDescriptor(getName());
 			ObjAttribute attribute = (ObjAttribute) resolver.getObjEntity(getName()).getAttribute(id.toString());
 			
@@ -174,9 +168,8 @@
 	 * @return a collection of {@link Relationship} objects.
 	 */
 	public Collection getRelationships() {
-		if(objectContext != null) {
-			return objectContext.getEntityResolver().getObjEntity(getName()).getRelationships();
-		}
+		if(this.objectContext != null)
+			return this.objectContext.getEntityResolver().getObjEntity(getName()).getRelationships();
 		return Collections.EMPTY_LIST;
 	}
 
@@ -203,7 +196,7 @@
 	 */
 	public synchronized void removePropertyChangeListener(PropertyChangeListener l) {
 		if (l != null) {
-			pcsDelegate.removePropertyChangeListener(l);
+			this.pcsDelegate.removePropertyChangeListener(l);
 		}
 	}
 	
@@ -236,12 +229,12 @@
 	 */
 	public void setPropertyValue(Object id, Object value) {
 		
-		if(objectContext != null) {            
-			EntityResolver resolver = objectContext.getEntityResolver();
+		if(this.objectContext != null) {            
+			EntityResolver resolver = this.objectContext.getEntityResolver();
 			ClassDescriptor descriptor = resolver.getClassDescriptor(getName());
 			ObjAttribute attribute = (ObjAttribute) resolver.getObjEntity(getName()).getAttribute(id.toString());
 			
-			objectContext.prepareForAccess(this, id.toString());
+			this.objectContext.prepareForAccess(this, id.toString());
 	        Object oldValue = descriptor.getProperty(id.toString()).readProperty(this);
 	        Object newValue = null;
 	        
@@ -255,7 +248,7 @@
 	        descriptor.getProperty(id.toString()).writeProperty(this, oldValue, newValue);
 	        
 	        // notify objectContext about simple property change
-	        objectContext.propertyChanged(this, id.toString(), oldValue, newValue);
+	        this.objectContext.propertyChanged(this, id.toString(), oldValue, newValue);
 	        
 	        firePropertyChange(PROP_MODIFIED, null, this);
 		}
@@ -268,17 +261,17 @@
 	 * @param newValue the new target of the relationship
 	 */
 	public void setRelationship(Relationship rel, Object oldValue, Object newValue) {
-		if (objectContext != null) {
+		if (this.objectContext != null) {
 			
-			EntityResolver resolver = objectContext.getEntityResolver();
+			EntityResolver resolver = this.objectContext.getEntityResolver();
 			ClassDescriptor descriptor = resolver.getClassDescriptor(getName());
 			
-			objectContext.prepareForAccess(this, rel.getName());
+			this.objectContext.prepareForAccess(this, rel.getName());
 			
 			descriptor.getProperty(rel.getName()).writeProperty(this, oldValue, newValue);
 			
 			// notify objectContext about simple property change
-			objectContext.propertyChanged(this, rel.getName(), oldValue, newValue);
+			this.objectContext.propertyChanged(this, rel.getName(), oldValue, newValue);
 			firePropertyChange(PROP_MODIFIED, null, this);
 		}
 	}
@@ -289,11 +282,11 @@
 	 * @return the value of the property
 	 */
 	public Object getPropertyValueRaw(Object id) {
-		if(objectContext != null) {
+		if(this.objectContext != null) {
 			// prepare the object for access
-            objectContext.prepareForAccess(this, id.toString());
+            this.objectContext.prepareForAccess(this, id.toString());
 		
-			EntityResolver resolver = objectContext.getEntityResolver();
+			EntityResolver resolver = this.objectContext.getEntityResolver();
 			ClassDescriptor descriptor = resolver.getClassDescriptor(getName());
 			
 			return descriptor.getProperty(id.toString()).readProperty(this);



Mime
View raw message