notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r2548 - in development/main: depot/station/src/main/net/dpml/depot/prefs metro/composition/unit/src/main/net/dpml/composition/unit

From: mcconnell AT dpml.net
To: notify-dpml AT lists.ibiblio.org
Subject: svn commit: r2548 - in development/main: depot/station/src/main/net/dpml/depot/prefs metro/composition/unit/src/main/net/dpml/composition/unit
Date: Fri, 13 May 2005 20:19:17 +0000

Author: mcconnell AT dpml.net
Date: Fri May 13 20:19:16 2005
New Revision: 2548

Modified:

development/main/depot/station/src/main/net/dpml/depot/prefs/CachePanel.java

development/main/depot/station/src/main/net/dpml/depot/prefs/ContentHandlerControllerPanel.java

development/main/depot/station/src/main/net/dpml/depot/prefs/ContentHandlerMainPanel.java

development/main/depot/station/src/main/net/dpml/depot/prefs/ContentHandlerPanel.java

development/main/depot/station/src/main/net/dpml/depot/prefs/DepotPreferencesDialog.java

development/main/depot/station/src/main/net/dpml/depot/prefs/GenericTableModel.java

development/main/depot/station/src/main/net/dpml/depot/prefs/IconHelper.java

development/main/depot/station/src/main/net/dpml/depot/prefs/TransitPanel.java

development/main/depot/station/src/main/net/dpml/depot/prefs/TransitResourceHostPanel.java

development/main/metro/composition/unit/src/main/net/dpml/composition/unit/CompositionContentHandlerControlPanel.java
Log:
update depot prefs to handle images locally

Modified:
development/main/depot/station/src/main/net/dpml/depot/prefs/CachePanel.java
==============================================================================
---
development/main/depot/station/src/main/net/dpml/depot/prefs/CachePanel.java
(original)
+++
development/main/depot/station/src/main/net/dpml/depot/prefs/CachePanel.java
Fri May 13 20:19:16 2005
@@ -113,7 +113,7 @@

JLabel label =
IconHelper.createImageIconJLabel(
- Transit.class.getClassLoader(),
"net/dpml/transit/images/cache.jpg", "Filename", "Directory: " + filename );
+ Transit.class.getClassLoader(),
"net/dpml/depot/prefs/images/cache.jpg", "Filename", "Directory: " + filename
);
label.setBorder( new EmptyBorder( 0, 5, 0, 0 ) );
m_label = label;
m_ok = new JButton( new OKAction( "OK" ) );

Modified:
development/main/depot/station/src/main/net/dpml/depot/prefs/ContentHandlerControllerPanel.java
==============================================================================
---
development/main/depot/station/src/main/net/dpml/depot/prefs/ContentHandlerControllerPanel.java
(original)
+++
development/main/depot/station/src/main/net/dpml/depot/prefs/ContentHandlerControllerPanel.java
Fri May 13 20:19:16 2005
@@ -126,7 +126,7 @@
{
JLabel label =
IconHelper.createImageIconJLabel(
- Transit.class.getClassLoader(),
"net/dpml/transit/images/source.png", "URI", "Controller URI" );
+ Transit.class.getClassLoader(),
"net/dpml/depot/prefs/images/source.png", "URI", "Controller URI" );
label.setBorder( new EmptyBorder( 0, 5, 0, 0 ) );
JPanel panel = new JPanel();
panel.setLayout( new BorderLayout() );

Modified:
development/main/depot/station/src/main/net/dpml/depot/prefs/ContentHandlerMainPanel.java
==============================================================================
---
development/main/depot/station/src/main/net/dpml/depot/prefs/ContentHandlerMainPanel.java
(original)
+++
development/main/depot/station/src/main/net/dpml/depot/prefs/ContentHandlerMainPanel.java
Fri May 13 20:19:16 2005
@@ -182,7 +182,7 @@
JLabel label =
IconHelper.createImageIconJLabel(
getClass().getClassLoader(),
- "net/dpml/transit/images/misc.png",
+ "net/dpml/depot/prefs/images/misc.png",
"Artifact",
"Content Handler Controller settings." );
label.setBorder( new EmptyBorder( 0, 5, 0, 0 ) );

Modified:
development/main/depot/station/src/main/net/dpml/depot/prefs/ContentHandlerPanel.java
==============================================================================
---
development/main/depot/station/src/main/net/dpml/depot/prefs/ContentHandlerPanel.java
(original)
+++
development/main/depot/station/src/main/net/dpml/depot/prefs/ContentHandlerPanel.java
Fri May 13 20:19:16 2005
@@ -126,7 +126,7 @@
{
JLabel label =
IconHelper.createImageIconJLabel(
- getClass().getClassLoader(),
"net/dpml/transit/images/source.png", "URI", "Controller URI" );
+ getClass().getClassLoader(),
"net/dpml/depot/prefs/images/source.png", "URI", "Controller URI" );
label.setBorder( new EmptyBorder( 0, 5, 0, 0 ) );
JPanel panel = new JPanel();
panel.setLayout( new BorderLayout() );

Modified:
development/main/depot/station/src/main/net/dpml/depot/prefs/DepotPreferencesDialog.java
==============================================================================
---
development/main/depot/station/src/main/net/dpml/depot/prefs/DepotPreferencesDialog.java
(original)
+++
development/main/depot/station/src/main/net/dpml/depot/prefs/DepotPreferencesDialog.java
Fri May 13 20:19:16 2005
@@ -71,7 +71,7 @@
/**
* The DPML icon.
*/
- private static String DPML_ICON_FILENAME =
"net/dpml/transit/images/dpml.gif";
+ private static String DPML_ICON_FILENAME =
"net/dpml/depot/prefs/images/dpml.gif";

/**
* The default dialog width.

Modified:
development/main/depot/station/src/main/net/dpml/depot/prefs/GenericTableModel.java
==============================================================================
---
development/main/depot/station/src/main/net/dpml/depot/prefs/GenericTableModel.java
(original)
+++
development/main/depot/station/src/main/net/dpml/depot/prefs/GenericTableModel.java
Fri May 13 20:19:16 2005
@@ -47,7 +47,7 @@
/**
* Default small icon path.
*/
- private static final String ICON_PATH =
"net/dpml/transit/images/item.gif";
+ private static final String ICON_PATH =
"net/dpml/depot/prefs/images/item.gif";

/**
* Constant row identifier for the icon.

Modified:
development/main/depot/station/src/main/net/dpml/depot/prefs/IconHelper.java
==============================================================================
---
development/main/depot/station/src/main/net/dpml/depot/prefs/IconHelper.java
(original)
+++
development/main/depot/station/src/main/net/dpml/depot/prefs/IconHelper.java
Fri May 13 20:19:16 2005
@@ -25,7 +25,7 @@

/**
*/
-class IconHelper
+public class IconHelper
{
public static JLabel createImageIconJLabel( ClassLoader classloader,
String path, String description, String text )
{

Modified:
development/main/depot/station/src/main/net/dpml/depot/prefs/TransitPanel.java
==============================================================================
---
development/main/depot/station/src/main/net/dpml/depot/prefs/TransitPanel.java
(original)
+++
development/main/depot/station/src/main/net/dpml/depot/prefs/TransitPanel.java
Fri May 13 20:19:16 2005
@@ -172,7 +172,7 @@
JLabel label =
IconHelper.createImageIconJLabel(
TransitPanel.class.getClassLoader(),
- "net/dpml/transit/images/cache.jpg",
+ "net/dpml/depot/prefs/images/cache.jpg",
"Properties",
"Cache handler properties and settings." );
label.setBorder( new EmptyBorder( 0, 5, 0, 0 ) );

Modified:
development/main/depot/station/src/main/net/dpml/depot/prefs/TransitResourceHostPanel.java
==============================================================================
---
development/main/depot/station/src/main/net/dpml/depot/prefs/TransitResourceHostPanel.java
(original)
+++
development/main/depot/station/src/main/net/dpml/depot/prefs/TransitResourceHostPanel.java
Fri May 13 20:19:16 2005
@@ -130,7 +130,7 @@

m_label =
IconHelper.createImageIconJLabel(
- Transit.class.getClassLoader(),
"net/dpml/transit/images/server.png", "Host", "Host: " + name );
+ Transit.class.getClassLoader(),
"net/dpml/depot/prefs/images/server.png", "Host", "Host: " + name );

m_label.setBorder( new EmptyBorder( 0, 5, 0, 10 ) );
JPanel labelPanel = new JPanel();
@@ -213,7 +213,7 @@
new TitledBorder( null, "Credentials", TitledBorder.LEFT,
TitledBorder.TOP), border5 ) );
// TODO: action support for credential settings
ImageIcon keysIcon = IconHelper.createImageIcon(
- Transit.class.getClassLoader(),
"net/dpml/transit/images/password.png", "Credentials" );
+ Transit.class.getClassLoader(),
"net/dpml/depot/prefs/images/password.png", "Credentials" );
JLabel keys = new JLabel( keysIcon );
JButton settings = new JButton( "Settings" );
settings.setEnabled( false );

Modified:
development/main/metro/composition/unit/src/main/net/dpml/composition/unit/CompositionContentHandlerControlPanel.java
==============================================================================
---
development/main/metro/composition/unit/src/main/net/dpml/composition/unit/CompositionContentHandlerControlPanel.java
(original)
+++
development/main/metro/composition/unit/src/main/net/dpml/composition/unit/CompositionContentHandlerControlPanel.java
Fri May 13 20:19:16 2005
@@ -26,15 +26,24 @@
import javax.swing.border.EmptyBorder;
import javax.swing.JPanel;

+import net.dpml.depot.prefs.IconHelper;
+
+
/**
* A registry of descriptions of plugable content handlers. This
implementation
* maps user defined preferences to instance of ContentHandlerDescriptor.
*/
public class CompositionContentHandlerControlPanel extends JDialog
{
+ /**
+ * The DPML icon.
+ */
+ private static String METRO_ICON_FILENAME =
"net/dpml/composition/images/metro.gif";
+
public CompositionContentHandlerControlPanel( Dialog parent )
{
super( parent );
+ setTitle( "Metro FT Content Controller" );
setModal( true );
setSize( new Dimension( 400,400 ) );
JPanel frame = new JPanel();
@@ -42,6 +51,10 @@
frame.setBackground( Color.white );
frame.setBorder( new EmptyBorder( 10, 6, 0, 6 ) );
setContentPane( frame );
- setTitle( "Content Handler Controller" );
+
+ JLabel label =
+ IconHelper.createImageIconJLabel(
+ getClass().getClassLoader(), METRO_ICON_FILENAME, "", "DPML
Metro" );
+ label.setBorder( new EmptyBorder( 5, 0, 0, 0 ) );
}
}

svn commit: r2548 - in development/main: depot/station/src/main/net/dpml/depot/prefs metro/composition/unit/src/main/net/dpml/composition/unit, mcconnell, 05/13/2005