Formatting pass

1 files changed, 92 insertions, 122 deletions

diff --git a/projects/net.wotonomy.test/src/main/java/net/wotonomy/test/TreeInspectorController.java b/projects/net.wotonomy.test/src/main/java/net/wotonomy/test/TreeInspectorController.java
index 8ec9554..1695103 100644
--- a/projects/net.wotonomy.test/src/main/java/net/wotonomy/test/TreeInspectorController.java
+++ b/projects/net.wotonomy.test/src/main/java/net/wotonomy/test/TreeInspectorController.java
@@ -21,164 +21,134 @@ import net.wotonomy.ui.swing.TreeAssociation;
 import net.wotonomy.ui.swing.util.WindowUtilities;
 
 /**
-* A simple editor panel with a few textfields.
-*/
-public class TreeInspectorController 
-{    
-    public TreeInspectorController( EODisplayGroup titlesGroup, EODisplayGroup childrenGroup )
-    {
-        final EODisplayGroup group = childrenGroup;
+ * A simple editor panel with a few textfields.
+ */
+public class TreeInspectorController {
+	public TreeInspectorController(EODisplayGroup titlesGroup, EODisplayGroup childrenGroup) {
+		final EODisplayGroup group = childrenGroup;
 //        final EODisplayGroup group = titlesGroup;
 		final TreePanel treePanel = new TreePanel();
-		
+
 		// text associations
-		
+
 		EOAssociation ta;
-		
-		ta = new TreeAssociation( treePanel.tree, "People" );
-		ta.bindAspect( EOAssociation.TitlesAspect, titlesGroup, "lastName" );
-		ta.bindAspect( EOAssociation.ChildrenAspect, group, "childList" );
-		ta.bindAspect( EOAssociation.IsLeafAspect, titlesGroup, "childCount" );
+
+		ta = new TreeAssociation(treePanel.tree, "People");
+		ta.bindAspect(EOAssociation.TitlesAspect, titlesGroup, "lastName");
+		ta.bindAspect(EOAssociation.ChildrenAspect, group, "childList");
+		ta.bindAspect(EOAssociation.IsLeafAspect, titlesGroup, "childCount");
 //		ta.bindAspect( EOAssociation.IsLeafAspect, null, "false" );
 		ta.establishConnection();
-		treePanel.tree.setEditable( true );
-		
-        ta = new TextAssociation( treePanel.editPanel.firstNameField );
-        ta.bindAspect( EOAssociation.ValueAspect, group, "firstName" );
+		treePanel.tree.setEditable(true);
+
+		ta = new TextAssociation(treePanel.editPanel.firstNameField);
+		ta.bindAspect(EOAssociation.ValueAspect, group, "firstName");
 		ta.establishConnection();
-        
-        ta = new TextAssociation( treePanel.editPanel.middleNameField );
-        ta.bindAspect( EOAssociation.ValueAspect, group, "middleName" );
+
+		ta = new TextAssociation(treePanel.editPanel.middleNameField);
+		ta.bindAspect(EOAssociation.ValueAspect, group, "middleName");
 		ta.establishConnection();
-        
-        ta = new TextAssociation( treePanel.editPanel.lastNameField );
-        ta.bindAspect( EOAssociation.ValueAspect, group, "lastName" );
+
+		ta = new TextAssociation(treePanel.editPanel.lastNameField);
+		ta.bindAspect(EOAssociation.ValueAspect, group, "lastName");
 		ta.establishConnection();
 
-		ta = new RadioPanelAssociation( treePanel.editPanel.yearRadioPanel );
-		ta.bindAspect( EOAssociation.ValueAspect, group, "createDate.year" );
-		
+		ta = new RadioPanelAssociation(treePanel.editPanel.yearRadioPanel);
+		ta.bindAspect(EOAssociation.ValueAspect, group, "createDate.year");
+
 		EODisplayGroup yearTitles = new EODisplayGroup();
-		yearTitles.setObjectArray( new NSArray( 
-			new Object[] { "1999", "2000", "2001" } ) );
-		ta.bindAspect( EOAssociation.TitlesAspect, yearTitles, "" );
-	
+		yearTitles.setObjectArray(new NSArray(new Object[] { "1999", "2000", "2001" }));
+		ta.bindAspect(EOAssociation.TitlesAspect, yearTitles, "");
+
 		EODisplayGroup yearObjects = new EODisplayGroup();
-		yearObjects.setObjectArray( new NSArray( 
-			new Object[] { new Integer( 99 ), new Integer( 100 ), new Integer( 101 ) } ) );
-		ta.bindAspect( EOAssociation.ObjectsAspect, yearObjects, "" );
-		
+		yearObjects.setObjectArray(new NSArray(new Object[] { new Integer(99), new Integer(100), new Integer(101) }));
+		ta.bindAspect(EOAssociation.ObjectsAspect, yearObjects, "");
+
 		ta.establishConnection();
 
 		// detail group
-		
+
 		final EODisplayGroup detailGroup = new EODisplayGroup();
-		
-		ta = new MasterDetailAssociation( detailGroup );
-		ta.bindAspect( EOAssociation.ParentAspect, group, "childList" );
+
+		ta = new MasterDetailAssociation(detailGroup);
+		ta.bindAspect(EOAssociation.ParentAspect, group, "childList");
 		ta.establishConnection();
-		
-		ta = new ListAssociation( treePanel.editPanel.list );
-		ta.bindAspect( EOAssociation.TitlesAspect, detailGroup, "fullName" );
+
+		ta = new ListAssociation(treePanel.editPanel.list);
+		ta.bindAspect(EOAssociation.TitlesAspect, detailGroup, "fullName");
 		ta.establishConnection();
-		
+
 		// display group action associations
 
-		AbstractButton addButton = (AbstractButton)
-			treePanel.editPanel.addPanel.getButton( "Add" );
-		addButton.addActionListener( new ActionListener()
-		{
-			public void actionPerformed( ActionEvent evt )
-			{
-				detailGroup.insertObjectAtIndex( new TestObject(), 0 );	
-			}
-		} );
-
-		AbstractButton removeButton = (AbstractButton)
-			treePanel.editPanel.addPanel.getButton( "Remove" );
-		removeButton.addActionListener( new ActionListener()
-		{
-			public void actionPerformed( ActionEvent evt )
-			{
-                if ( detailGroup.selectedObject() != null )
-    				detailGroup.deleteSelection();	
+		AbstractButton addButton = (AbstractButton) treePanel.editPanel.addPanel.getButton("Add");
+		addButton.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent evt) {
+				detailGroup.insertObjectAtIndex(new TestObject(), 0);
 			}
-		} );
-/*
-		AbstractButton refreshButton = (AbstractButton)
-			treePanel.editPanel.addPanel.getButton( "Refresh" );
-		refreshButton.addActionListener( new ActionListener()
-		{
-            int count = 0;
-			public void actionPerformed( ActionEvent evt )
-			{                
-                EODisplayGroup displayGroup = (EODisplayGroup)
-                   treePanel.tree.getSelectionPath().getLastPathComponent();
-//                displayGroup.insertObjectAtIndex( new TestObject(), 0 );
-//                displayGroup.deleteObjectAtIndex( 0 );
-               List sortOrderings = new LinkedList();
-               if ( count++ % 2 == 0 )
-               {
-                   sortOrderings.add( new EOSortOrdering( 
-                        "lastName", EOSortOrdering.CompareAscending ) );
-               }
-               else
-               {
-                   sortOrderings.add( new EOSortOrdering( 
-                        "lastName", EOSortOrdering.CompareDescending ) );
-               }
-               displayGroup.setSortOrderings( sortOrderings );
-               displayGroup.updateDisplayedObjects();
+		});
+
+		AbstractButton removeButton = (AbstractButton) treePanel.editPanel.addPanel.getButton("Remove");
+		removeButton.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent evt) {
+				if (detailGroup.selectedObject() != null)
+					detailGroup.deleteSelection();
 			}
-		} );
-*/        
-/*		
-		ta = new DisplayGroupActionAssociation( 
-            treePanel.editPanel.addPanel.getButton( "Remove" ) );
-		ta.bindAspect( EOAssociation.ActionAspect, detailGroup, "deleteSelection" );
-		ta.establishConnection();
-        
-		ta = new DisplayGroupActionAssociation( 
-            treePanel.editPanel.addPanel.getButton( "Refresh" ) );
-		ta.bindAspect( EOAssociation.ActionAspect, group, "updateDisplayedObjects" );
-		ta.establishConnection();
-*/
+		});
+		/*
+		 * AbstractButton refreshButton = (AbstractButton)
+		 * treePanel.editPanel.addPanel.getButton( "Refresh" );
+		 * refreshButton.addActionListener( new ActionListener() { int count = 0; public
+		 * void actionPerformed( ActionEvent evt ) { EODisplayGroup displayGroup =
+		 * (EODisplayGroup) treePanel.tree.getSelectionPath().getLastPathComponent(); //
+		 * displayGroup.insertObjectAtIndex( new TestObject(), 0 ); //
+		 * displayGroup.deleteObjectAtIndex( 0 ); List sortOrderings = new LinkedList();
+		 * if ( count++ % 2 == 0 ) { sortOrderings.add( new EOSortOrdering( "lastName",
+		 * EOSortOrdering.CompareAscending ) ); } else { sortOrderings.add( new
+		 * EOSortOrdering( "lastName", EOSortOrdering.CompareDescending ) ); }
+		 * displayGroup.setSortOrderings( sortOrderings );
+		 * displayGroup.updateDisplayedObjects(); } } );
+		 */
+		/*
+		 * ta = new DisplayGroupActionAssociation(
+		 * treePanel.editPanel.addPanel.getButton( "Remove" ) ); ta.bindAspect(
+		 * EOAssociation.ActionAspect, detailGroup, "deleteSelection" );
+		 * ta.establishConnection();
+		 * 
+		 * ta = new DisplayGroupActionAssociation(
+		 * treePanel.editPanel.addPanel.getButton( "Refresh" ) ); ta.bindAspect(
+		 * EOAssociation.ActionAspect, group, "updateDisplayedObjects" );
+		 * ta.establishConnection();
+		 */
 
 		// add mouse listener for list
-		
-		treePanel.editPanel.list.addMouseListener( new MouseAdapter() 
-		{
-			public void mouseClicked(MouseEvent e)
-			{
-				if ( e.getClickCount() == 2 )
-				{
+
+		treePanel.editPanel.list.addMouseListener(new MouseAdapter() {
+			public void mouseClicked(MouseEvent e) {
+				if (e.getClickCount() == 2) {
 					Object item = detailGroup.selectedObject();
-					if ( item != null )
-					{
-						new InspectorController( item );
-					}		
+					if (item != null) {
+						new InspectorController(item);
+					}
 				}
 			}
 		});
 
 		// launch
-		
+
 		JDialog d = new JDialog();
-		d.getContentPane().add( treePanel );
-		d.setTitle( "Tree Panel" );
+		d.getContentPane().add(treePanel);
+		d.setTitle("Tree Panel");
 		d.pack();
-        WindowUtilities.cascade( d );
+		WindowUtilities.cascade(d);
 		d.show();
 
-        // workaround for memory issues on jdk1.2.2
-		d.addWindowListener( new WindowAdapter()
-		{
+		// workaround for memory issues on jdk1.2.2
+		d.addWindowListener(new WindowAdapter() {
 			// exit on close
-			public void windowClosing(WindowEvent e)
-			{	
-				((JDialog)e.getWindow()).getContentPane().removeAll();
+			public void windowClosing(WindowEvent e) {
+				((JDialog) e.getWindow()).getContentPane().removeAll();
 			}
 		});
 	}
-    
+
 }