notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r2724 - in development: laboratory/spells/derbyant/src/main/com/ibm/developerworks/derby/ant main/depot/prefs/src/main/net/dpml/depot/prefs main/transit/core/handler/src/main/net/dpml/transit/manager

From: mcconnell AT dpml.net
To: notify-dpml AT lists.ibiblio.org
Subject: svn commit: r2724 - in development: laboratory/spells/derbyant/src/main/com/ibm/developerworks/derby/ant main/depot/prefs/src/main/net/dpml/depot/prefs main/transit/core/handler/src/main/net/dpml/transit/manager
Date: Sun, 05 Jun 2005 16:28:19 -0400

Author: mcconnell AT dpml.net
Date: Sun Jun 5 16:28:19 2005
New Revision: 2724

Modified:

development/laboratory/spells/derbyant/src/main/com/ibm/developerworks/derby/ant/StartDerbyTask.java

development/main/depot/prefs/src/main/net/dpml/depot/prefs/CacheManagerPanel.java

development/main/depot/prefs/src/main/net/dpml/depot/prefs/ContentRegistryManagerPanel.java

development/main/depot/prefs/src/main/net/dpml/depot/prefs/LayoutRegistryManagerPanel.java

development/main/depot/prefs/src/main/net/dpml/depot/prefs/ProxyManagerPanel.java

development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultHostManager.java
Log:
Improve consistency in panel layouts.

Modified:
development/laboratory/spells/derbyant/src/main/com/ibm/developerworks/derby/ant/StartDerbyTask.java
==============================================================================
---
development/laboratory/spells/derbyant/src/main/com/ibm/developerworks/derby/ant/StartDerbyTask.java
(original)
+++
development/laboratory/spells/derbyant/src/main/com/ibm/developerworks/derby/ant/StartDerbyTask.java
Sun Jun 5 16:28:19 2005
@@ -11,7 +11,7 @@
try {
Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
System.out.println("Derby has been started!");
- } catch (Exception e) {
+ } catch (Throwable e) {
System.out.println(
"Derby could not start. This is most likely " +
"due to missing Derby JAR files. Please check your classpath" +

Modified:
development/main/depot/prefs/src/main/net/dpml/depot/prefs/CacheManagerPanel.java
==============================================================================
---
development/main/depot/prefs/src/main/net/dpml/depot/prefs/CacheManagerPanel.java
(original)
+++
development/main/depot/prefs/src/main/net/dpml/depot/prefs/CacheManagerPanel.java
Sun Jun 5 16:28:19 2005
@@ -119,6 +119,7 @@
new TitledBorder(
new EmptyBorder( 0,0,0,0 ), "Resource Hosts", TitledBorder.LEFT,
TitledBorder.TOP );
hostPanel.setBorder( new CompoundBorder( tb, border5 ) );
+ getBody().add( hostPanel );

TableColumnModel columns = createHostsColumnModel();
m_tableModel = new CacheTableModel( manager );
@@ -127,18 +128,11 @@
m_table.setShowVerticalLines( false );
m_table.setShowHorizontalLines( false );

- JScrollPane scroller = createScrollPanel( m_table );
- hostPanel.add( scroller, BorderLayout.CENTER );
- JPanel buttonHolder = new JPanel();
- buttonHolder.setLayout( new FlowLayout( FlowLayout.RIGHT ) );
- buttonHolder.add( new JButton( new AddAction( "Add" ) ) );
- buttonHolder.add( m_edit );
- buttonHolder.add( m_delete );
- buttonHolder.setBorder( new EmptyBorder( 10, 10, 5, 0 ) );
- buttonHolder.setBackground( Color.white );
- hostPanel.add( buttonHolder, BorderLayout.SOUTH );
-
- getBody().add( hostPanel, BorderLayout.CENTER );
+ JButton[] buttons = new JButton[ 3 ];
+ buttons[0] = new JButton( new AddAction( "Add" ) );
+ buttons[1] = m_edit;
+ buttons[2] = m_delete;
+ getBody().addScrollingEntry( m_table, "Content Handlers", buttons );
}

public void dispose()

Modified:
development/main/depot/prefs/src/main/net/dpml/depot/prefs/ContentRegistryManagerPanel.java
==============================================================================
---
development/main/depot/prefs/src/main/net/dpml/depot/prefs/ContentRegistryManagerPanel.java
(original)
+++
development/main/depot/prefs/src/main/net/dpml/depot/prefs/ContentRegistryManagerPanel.java
Sun Jun 5 16:28:19 2005
@@ -93,6 +93,14 @@
m_edit = new JButton( m_editAction );
m_delete = new JButton( new DeleteAction( "Delete" ) );

+ JLabel label =
+ IconHelper.createImageIconJLabel(
+ getClass().getClassLoader(), MISC_IMG_PATH,
+ "Artifact", "Content Handler Controller settings." );
+ label.setBorder( new EmptyBorder( 0, 5, 0, 0 ) );
+ ControllerAction controller = new ControllerAction( "Controller" );
+ getHeader().addEntry( label, "Content Management Controller", new
JButton( controller ) );
+
JPanel panel = new JPanel();
panel.setBackground( Color.white );
panel.setLayout( new BorderLayout() );
@@ -100,34 +108,20 @@
new TitledBorder(
new EmptyBorder( 0,0,0,0 ), "Content Handlers",
TitledBorder.LEFT, TitledBorder.TOP );
panel.setBorder( new CompoundBorder( tb, border5 ) );
+ getBody().add( panel );

TableColumnModel columns = createContentHandlerColumnModel();
m_tableModel = new ContentRegistryTableModel( manager );
-
m_table = new ClassicTable( m_tableModel, columns );
m_table.addPropertyChangeListener( this );
m_table.setShowVerticalLines( false );
m_table.setShowHorizontalLines( false );

- JScrollPane scroller = createScrollPanel( m_table );
- panel.add( scroller, BorderLayout.CENTER );
- JPanel buttons = new JPanel();
- buttons.setLayout( new FlowLayout( FlowLayout.RIGHT ) );
- buttons.add( new JButton( new AddAction( "Add" ) ) );
- buttons.add( m_edit );
- buttons.add( m_delete );
- buttons.setBorder( new EmptyBorder( 10, 10, 5, 0 ) );
- buttons.setBackground( Color.white );
- panel.add( buttons, BorderLayout.SOUTH );
-
- JLabel label =
- IconHelper.createImageIconJLabel(
- getClass().getClassLoader(), MISC_IMG_PATH,
- "Artifact", "Content Handler Controller settings." );
- label.setBorder( new EmptyBorder( 0, 5, 0, 0 ) );
- ControllerAction controller = new ControllerAction( "Controller" );
- getHeader().addEntry( label, "Content Management Controller", new
JButton( controller ) );
- getBody().add( panel );
+ JButton[] buttons = new JButton[ 3 ];
+ buttons[0] = new JButton( new AddAction( "Add" ) );
+ buttons[1] = m_edit;
+ buttons[2] = m_delete;
+ getBody().addScrollingEntry( m_table, "Content Handlers", buttons );
}

public void dispose()

Modified:
development/main/depot/prefs/src/main/net/dpml/depot/prefs/LayoutRegistryManagerPanel.java
==============================================================================
---
development/main/depot/prefs/src/main/net/dpml/depot/prefs/LayoutRegistryManagerPanel.java
(original)
+++
development/main/depot/prefs/src/main/net/dpml/depot/prefs/LayoutRegistryManagerPanel.java
Sun Jun 5 16:28:19 2005
@@ -92,6 +92,14 @@
m_edit = new JButton( m_editAction );
m_delete = new JButton( new DeleteAction( "Delete" ) );

+ JLabel label =
+ IconHelper.createImageIconJLabel(
+ getClass().getClassLoader(), MISC_IMG_PATH,
+ "Artifact", "Layout Registry Controller settings." );
+ label.setBorder( new EmptyBorder( 0, 5, 0, 0 ) );
+ ControllerAction controller = new ControllerAction( "Controller" );
+ getHeader().addEntry( label, "Layout Registry Controller", new
JButton( controller ) );
+
JPanel panel = new JPanel();
panel.setBackground( Color.white );
panel.setLayout( new BorderLayout() );
@@ -99,34 +107,20 @@
new TitledBorder(
new EmptyBorder( 0,0,0,0 ), "Layout Strategies",
TitledBorder.LEFT, TitledBorder.TOP );
panel.setBorder( new CompoundBorder( tb, border5 ) );
+ getBody().add( panel );

TableColumnModel columns = createResolverHandlerColumnModel();
m_tableModel = new LayoutRegistryTableModel( manager );
-
m_table = new ClassicTable( m_tableModel, columns );
m_table.addPropertyChangeListener( this );
m_table.setShowVerticalLines( false );
m_table.setShowHorizontalLines( false );

- JScrollPane scroller = createScrollPanel( m_table );
- panel.add( scroller, BorderLayout.CENTER );
- JPanel buttons = new JPanel();
- buttons.setLayout( new FlowLayout( FlowLayout.RIGHT ) );
- buttons.add( new JButton( new AddAction( "Add" ) ) );
- buttons.add( m_edit );
- buttons.add( m_delete );
- buttons.setBorder( new EmptyBorder( 10, 10, 5, 0 ) );
- buttons.setBackground( Color.white );
- panel.add( buttons, BorderLayout.SOUTH );
-
- JLabel label =
- IconHelper.createImageIconJLabel(
- getClass().getClassLoader(), MISC_IMG_PATH,
- "Artifact", "Layout Registry Controller settings." );
- label.setBorder( new EmptyBorder( 0, 5, 0, 0 ) );
- ControllerAction controller = new ControllerAction( "Controller" );
- getHeader().addEntry( label, "Layout Registry Controller", new
JButton( controller ) );
- getBody().add( panel );
+ JButton[] buttons = new JButton[ 3 ];
+ buttons[0] = new JButton( new AddAction( "Add" ) );
+ buttons[1] = m_edit;
+ buttons[2] = m_delete;
+ getBody().addScrollingEntry( m_table, "Repository Layouts", buttons
);
}

public void dispose()

Modified:
development/main/depot/prefs/src/main/net/dpml/depot/prefs/ProxyManagerPanel.java
==============================================================================
---
development/main/depot/prefs/src/main/net/dpml/depot/prefs/ProxyManagerPanel.java
(original)
+++
development/main/depot/prefs/src/main/net/dpml/depot/prefs/ProxyManagerPanel.java
Sun Jun 5 16:28:19 2005
@@ -111,7 +111,7 @@

m_add = new AddAction( "Add" );
m_edit = new EditAction( "Edit" );
- m_remove = new RemoveAction( "Remove" );
+ m_remove = new RemoveAction( "Delete" );
m_editButton = new JButton( m_edit );

TableColumnModel columns = new DefaultTableColumnModel();
@@ -119,6 +119,7 @@
m_tableModel = new ProxyExcludesTableModel( manager );
m_table = new ClassicTable( m_tableModel, columns );
m_table.addPropertyChangeListener( this );
+
JButton[] buttons = new JButton[ 3 ];
buttons[0] = new JButton( m_add );
buttons[1] = m_editButton;

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultHostManager.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultHostManager.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultHostManager.java
Sun Jun 5 16:28:19 2005
@@ -137,8 +137,8 @@
m_trusted = trusted;
m_layout = layout;
m_authentication = auth;
-
m_identifier = getRequestIdentifier( base, scheme, prompt );
+
setModified();
HostChangeEvent e =
new HostChangeEvent(

svn commit: r2724 - in development: laboratory/spells/derbyant/src/main/com/ibm/developerworks/derby/ant main/depot/prefs/src/main/net/dpml/depot/prefs main/transit/core/handler/src/main/net/dpml/transit/manager, mcconnell, 06/05/2005