[CVS nano] unending!

Paul Hammant <paul-yCVjj/[email protected]> Mon, 17 Nov 2003 16:05:07 -0600
Newsgroups gmane.comp.java.nanocontainer.cvs
Message-ID <[email protected]> 
Commit in nano on MAIN

jmx/src/java/org/picoextras/jmx/package.html +8 added 1.1

picogui/src/java/org/picoextras/gui/model/package.html +3 added 1.1

picogui/src/java/org/picoextras/gui/swing/defaultcomponent.gif [binary] added 1.1

/package.html +3 added 1.1

/picocontainer.gif [binary] added 1.1

picogui/src/java/org/picocontainer/gui/model/BeanPropertyModel.java -60 1.2 removed

/BeanPropertyTableModel.java -65 1.5 removed

/ComponentNode.java -13 1.3 removed

/ContainerNode.java -55 1.5 removed

/package.html -3 1.1 removed

picogui/src/java/org/picocontainer/gui/swing/AddPicoComponentAction.java -72 1.2 removed

/AddPicoContainerAction.java -35 1.2 removed

/AddToContainerNodeAction.java -47 1.1 removed

/ComponentRegistrar.java -37 1.3 removed

/EditContainerPanel.java -25 1.7 removed

/ExecuteContainerAction.java -55 1.2 removed

/PicoGui.java -120 1.6 removed

/PicoTreeCellRenderer.java -56 1.8 removed

/PicoTreeModel.java -77 1.2 removed

/PropertyTableCommander.java -34 1.5 removed

/TreeExpander.java -48 1.1 removed

/defaultcomponent.gif [binary] 1.1 removed

/package.html -3 1.1 removed

/picocontainer.gif [binary] 1.2 removed

+14 -805

5 added + 19 removed, total 24 files

unending!

----------

nano /jmx /src /java /org /picoextras /jmx

package.html added at 1.1

diff -N package.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ package.html 17 Nov 2003 22:05:05 -0000 1.1
@@ -0,0 +1,8 @@

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+</head>
+<body>
+Foo
+</body>
+</html>

----------

nano /picogui /src /java /org /picoextras /gui /model

package.html added at 1.1

diff -N package.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ package.html 17 Nov 2003 22:05:05 -0000 1.1
@@ -0,0 +1,3 @@

+<body>
+Reusable model that can be used by both Swing and SWT.
+</body>

----------

nano /picogui /src /java /org /picoextras /gui /swing

package.html added at 1.1

diff -N package.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ package.html 17 Nov 2003 22:05:05 -0000 1.1
@@ -0,0 +1,3 @@

+<body>
+Configuration panel in Swing that can be used in IDE plugins.
+</body>

----------

nano /picogui /src /java /org /picocontainer /gui /model

BeanPropertyModel.java removed after 1.2

diff -N BeanPropertyModel.java
--- BeanPropertyModel.java 11 Sep 2003 19:17:16 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,60 +0,0 @@

-package org.picocontainer.gui.model;
-
-import java.beans.PropertyDescriptor;
-import java.beans.BeanInfo;
-import java.beans.Introspector;
-import java.beans.IntrospectionException;
-import java.util.Map;
-import java.util.HashMap;
-
-/**
- * A model for a bean that
- *
- * @author Aslak Helles&oslash;y
- * @version $Revision: 1.2 $
- */
-public class BeanPropertyModel {
- private final Map propertyMap = new HashMap();
-
- private final PropertyDescriptor[] propertyDescriptors;
- private final Object[] propertyValues;
- private final Class beanClass;
-
- public BeanPropertyModel(Class beanClass) throws IntrospectionException {
- this.beanClass = beanClass;
- BeanInfo beanInfo = Introspector.getBeanInfo(beanClass);
- propertyDescriptors = beanInfo.getPropertyDescriptors();
- propertyValues = new Object[propertyDescriptors.length];
- }
-
- public PropertyDescriptor getPropertyDescriptor(int index) {
- return propertyDescriptors[index];
- }
-
- public Object getPropertyValue(int index) {
- return propertyValues[index];
- }
-
- public void setPropertyValue(Object value, int index) {
- // verify the type
- Class propertyType = getPropertyDescriptor(index).getPropertyType();
- if(!propertyType.isInstance(value)) throw new IllegalArgumentException("Bad value. Expected a " + propertyType.getName() + ". Got a " + value.getClass().getName());
- propertyValues[index] = value;
-
- // now set it in the map too.
- String propertyName = getPropertyDescriptor(index).getName();
- propertyMap.put(propertyName, value);
- }
-
- public int getSize() {
- return propertyDescriptors.length;
- }
-
- public Class getBeanClass() {
- return beanClass;
- }
-
- public Map getPropertyMap() {
- return propertyMap;
- }
-}

----------

nano /picogui /src /java /org /picocontainer /gui /model

BeanPropertyTableModel.java removed after 1.5

diff -N BeanPropertyTableModel.java
--- BeanPropertyTableModel.java 11 Sep 2003 19:17:16 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,65 +0,0 @@

-package org.picocontainer.gui.model;
-
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableModel;
-import javax.swing.event.TableModelListener;
-
-/**
- * @author Aslak Helles&oslash;y
- * @version $Revision: 1.5 $
- */
-public class BeanPropertyTableModel implements TableModel {
- private static final String[] TABLE_HEADER = new String[]{"Property", "Value"};
- public static final TableModel EMPTY_MODEL = new DefaultTableModel(BeanPropertyTableModel.TABLE_HEADER, 0);
-
- private final BeanPropertyModel beanPropertyModel;
-
- public BeanPropertyTableModel(BeanPropertyModel model) {
- this.beanPropertyModel = model;
- }
-
- public int getColumnCount() {
- return 2;
- }
-
- public int getRowCount() {
- return beanPropertyModel.getSize();
- }
-
- public boolean isCellEditable(int rowIndex, int columnIndex) {
- boolean hasWriteMethod = beanPropertyModel.getPropertyDescriptor(rowIndex).getWriteMethod() != null;
- return columnIndex == 1 && hasWriteMethod;
- }
-
- public Class getColumnClass(int columnIndex) {
- return Object.class;
- }
-
- public Object getValueAt(int rowIndex, int columnIndex) {
- if (columnIndex == 0) {
- return beanPropertyModel.getPropertyDescriptor(rowIndex).getDisplayName();
- } else {
- return beanPropertyModel.getPropertyValue(rowIndex);
- }
- }
-
- public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
- beanPropertyModel.setPropertyValue(aValue, rowIndex);
- }
-
- public String getColumnName(int columnIndex) {
- return TABLE_HEADER[columnIndex];
- }
-
- public void addTableModelListener(TableModelListener l) {
-
- }
-
- public void removeTableModelListener(TableModelListener l) {
-
- }
-
- public Object getBeanPropertyModel() {
- return beanPropertyModel;
- }
-}

----------

nano /picogui /src /java /org /picocontainer /gui /model

ComponentNode.java removed after 1.3

diff -N ComponentNode.java
--- ComponentNode.java 11 Sep 2003 19:17:16 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@

-package org.picocontainer.gui.model;
-
-import javax.swing.tree.DefaultMutableTreeNode;
-
-/**
- * @author Aslak Helles&oslash;y
- * @version $Revision: 1.3 $
- */
-public class ComponentNode extends DefaultMutableTreeNode {
- public ComponentNode(BeanPropertyModel beanPropertyModel) {
- super(beanPropertyModel);
- }
-}

----------

nano /picogui /src /java /org /picocontainer /gui /model

ContainerNode.java removed after 1.5

diff -N ContainerNode.java
--- ContainerNode.java 17 Sep 2003 23:57:27 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,55 +0,0 @@

-package org.picocontainer.gui.model;
-
-import org.picocontainer.*;
-import org.picocontainer.extras.BeanPropertyComponentAdapterFactory;
-import org.picocontainer.defaults.*;
-
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.TreeNode;
-import java.util.Map;
-
-/**
- * Usage pattern:
- * <p>
- * ContainerNode newChild = root.createRegistryChild(new DefaultComponentRegistry());
- * model.insertNodeInto(root, newChild, 0);
- *
- * @author Aslak Helles&oslash;y
- * @version $Revision: 1.5 $
- */
-public class ContainerNode extends DefaultMutableTreeNode {
- public ContainerNode() {
- super(new Object());
- }
-
- public MutablePicoContainer createPicoContainer() throws PicoInitializationException {
- BeanPropertyComponentAdapterFactory propertyFactory = new BeanPropertyComponentAdapterFactory(new DefaultComponentAdapterFactory());
-
- MutablePicoContainer result;
- if(getParent() != null) {
- ContainerNode parent = (ContainerNode) getParent();
- MutablePicoContainer parentContainer = parent.createPicoContainer();
- result = new DefaultPicoContainer(propertyFactory);
- result.addParent(parentContainer);
- } else {
- result = new DefaultPicoContainer(propertyFactory);
- }
-
- int childCount = getChildCount();
- for(int i = 0; i < childCount; i++) {
- TreeNode child = getChildAt(i);
- if(child instanceof ComponentNode) {
- ComponentNode componentNode = (ComponentNode) child;
- BeanPropertyModel beanPropertyModel = (BeanPropertyModel) componentNode.getUserObject();
-
- Class componentImplementation = beanPropertyModel.getBeanClass();
-
- Map propertyMap = beanPropertyModel.getPropertyMap();
- propertyFactory.setProperties(componentImplementation, propertyMap);
-
- result.registerComponentImplementation(componentImplementation);
- }
- }
- return result;
- }
-}

----------

nano /picogui /src /java /org /picocontainer /gui /model

package.html removed after 1.1

diff -N package.html
--- package.html 2 Sep 2003 00:18:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@

-<body>
-Reusable model that can be used by both Swing and SWT.
-</body>

----------

nano /picogui /src /java /org /picocontainer /gui /swing

AddPicoComponentAction.java removed after 1.2

diff -N AddPicoComponentAction.java
--- AddPicoComponentAction.java 16 Sep 2003 08:45:49 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,72 +0,0 @@

-package org.picocontainer.gui.swing;
-
-import javax.swing.*;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.Document;
-import javax.swing.event.DocumentListener;
-import javax.swing.event.DocumentEvent;
-import java.awt.event.ActionEvent;
-import java.awt.*;
-
-/**
- * Action that adds a new component. Enables itself if a container node
- * is selected and the current classname is a loadabe class. Otherwise
- * disabled.
- *
- * @author Aslak Helles&oslash;y
- * @version $Revision: 1.2 $
- */
-public class AddPicoComponentAction extends AddToContainerNodeAction implements DocumentListener {
- private final ComponentRegistrar componentRegistrar;
-
- private Class componentImplementation = null;
-
- public AddPicoComponentAction(
- ComponentRegistrar componentRegistrar,
- Component errorDialogParent,
- JTree treeToListenTo,
- Document documentToListenTo) {
- super("Add PicoComponent", errorDialogParent, treeToListenTo);
- this.componentRegistrar = componentRegistrar;
-
- documentToListenTo.addDocumentListener(this);
- }
-
- public void actionPerformed(ActionEvent evt) {
- try {
- componentRegistrar.createComponentNodeInTree(getSelectedContainerNode(), componentImplementation, componentImplementation);
- } catch (Exception e) {
- showErrorDialog(e);
- }
- }
-
- public void insertUpdate(DocumentEvent e) {
- setClassName(e);
- }
-
- public void removeUpdate(DocumentEvent e) {
- setClassName(e);
- }
-
- public void changedUpdate(DocumentEvent e) {
- setClassName(e);
- }
-
- private void setClassName(DocumentEvent evt) {
- try {
- String currentClassName = evt.getDocument().getText(0, evt.getDocument().getLength());
- try {
- componentImplementation = getClass().getClassLoader().loadClass(currentClassName);
- } catch (ClassNotFoundException e) {
- componentImplementation = null;
- }
- setEnabled();
- } catch (BadLocationException e) {
- throw new IllegalStateException(e.getMessage());
- }
- }
-
- protected void setEnabled() {
- setEnabled(componentImplementation != null && getSelectedContainerNode() != null);
- }
-}

\ No newline at end of file

----------

nano /picogui /src /java /org /picocontainer /gui /swing

AddPicoContainerAction.java removed after 1.2

diff -N AddPicoContainerAction.java
--- AddPicoContainerAction.java 19 Sep 2003 22:59:46 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@

-package org.picocontainer.gui.swing;
-
-import org.picocontainer.gui.model.ContainerNode;
-
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.TreeModel;
-import javax.swing.*;
-import java.awt.event.ActionEvent;
-import java.awt.*;
-
-/**
- * @author Aslak Helles&oslash;y
- * @version $Revision: 1.2 $
- */
-public class AddPicoContainerAction extends AddToContainerNodeAction {
- private final TreeModel treeModel;
-
- public AddPicoContainerAction(
- Component errorDialogParent,
- TreeModel treeModel,
- JTree treeToListenTo) {
- super("Add PicoContainer", errorDialogParent, treeToListenTo);
- this.treeModel = treeModel;
- }
-
- protected void setEnabled() {
- setEnabled(getSelectedContainerNode() != null);
-
- }
-
- public void actionPerformed(ActionEvent e) {
- ContainerNode containerNode = new ContainerNode();
-// treeModel.insertNodeInto(containerNode, getSelectedContainerNode(), 0);
- }
-}

----------

nano /picogui /src /java /org /picocontainer /gui /swing

AddToContainerNodeAction.java removed after 1.1

diff -N AddToContainerNodeAction.java
--- AddToContainerNodeAction.java 16 Sep 2003 23:08:10 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,47 +0,0 @@

-package org.picocontainer.gui.swing;
-
-import org.picocontainer.gui.model.ContainerNode;
-
-import javax.swing.*;
-import javax.swing.event.TreeSelectionListener;
-import javax.swing.event.TreeSelectionEvent;
-import java.awt.*;
-
-/**
- * @author Aslak Helles&oslash;y
- * @version $Revision: 1.1 $
- */
-public abstract class AddToContainerNodeAction extends AbstractAction implements TreeSelectionListener {
- private final Component errorDialogParent;
- private ContainerNode selectedContainerNode = null;
-
- public AddToContainerNodeAction(
- String name,
- Component errorDialogParent,
- JTree treeToListenTo) {
- super(name);
- this.errorDialogParent = errorDialogParent;
- treeToListenTo.addTreeSelectionListener(this);
- setEnabled();
- }
-
- public void valueChanged(TreeSelectionEvent evt) {
- Object selected = evt.getPath().getLastPathComponent();
- if(selected instanceof ContainerNode) {
- selectedContainerNode = (ContainerNode) selected;
- } else {
- selectedContainerNode = null;
- }
- setEnabled();
- }
-
- protected ContainerNode getSelectedContainerNode() {
- return selectedContainerNode;
- }
-
- protected void showErrorDialog(Exception e) {
- JOptionPane.showMessageDialog(errorDialogParent,e.getStackTrace(),e.getClass().getName() + " " + e.getMessage(), JOptionPane.ERROR_MESSAGE);
- }
-
- protected abstract void setEnabled();
-}

----------

nano /picogui /src /java /org /picocontainer /gui /swing

ComponentRegistrar.java removed after 1.3

diff -N ComponentRegistrar.java
--- ComponentRegistrar.java 19 Sep 2003 22:59:46 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,37 +0,0 @@

-package org.picocontainer.gui.swing;
-
-import org.picocontainer.gui.model.ContainerNode;
-import org.picocontainer.gui.model.BeanPropertyModel;
-import org.picocontainer.gui.model.ComponentNode;
-import org.picocontainer.gui.model.BeanPropertyTableModel;
-
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.TreeModel;
-import javax.swing.*;
-import java.beans.IntrospectionException;
-
-public class ComponentRegistrar {
- private final TreeModel treeModel;
- private final JTable table;
-
- public ComponentRegistrar(TreeModel treeModel, JTable table) {
- this.treeModel = treeModel;
- this.table = table;
- }
-
- public void createComponentNodeInTree(ContainerNode containerNode, Object componentKey, Class componentImplementation) throws IntrospectionException {
- BeanPropertyModel beanPropertyModel = new BeanPropertyModel(componentImplementation);
- ComponentNode componentNode = new ComponentNode(beanPropertyModel);
- //treeModel.insertNodeInto(componentNode, containerNode, 0);
-
- // now make a child node of the component displaying the property table.
- DefaultMutableTreeNode propNode = new DefaultMutableTreeNode(new BeanPropertyTableModel(beanPropertyModel));
- //treeModel.insertNodeInto(propNode, componentNode, 0);
- }
-
- public void displayInPropertyTable(BeanPropertyModel beanPropertyModel) {
- BeanPropertyTableModel beanPropertyTableModel = new BeanPropertyTableModel(beanPropertyModel);
- table.setModel(beanPropertyTableModel);
- }
-}

----------

nano /picogui /src /java /org /picocontainer /gui /swing

EditContainerPanel.java removed after 1.7

diff -N EditContainerPanel.java
--- EditContainerPanel.java 16 Sep 2003 08:45:49 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@

-package org.picocontainer.gui.swing;
-
-import javax.swing.*;
-import javax.swing.text.Document;
-
-/**
- * @author Aslak Helles&oslash;y
- * @version $Revision: 1.7 $
- */
-public class EditContainerPanel extends JPanel {
-
- public EditContainerPanel(AddPicoComponentAction addPicoComponentAction,
- AddPicoContainerAction addPicoContainerAction,
- ExecuteContainerAction executeContainerAction,
- Document componentImplementationDocument) {
-
- JTextField componentField = new JTextField(componentImplementationDocument,PicoGui.A.class.getName(), 25);
- componentField.addActionListener(addPicoComponentAction);
-
- add(componentField);
- add(new JButton(addPicoComponentAction));
- add(new JButton(addPicoContainerAction));
- add(new JButton(executeContainerAction));
- }
-}

----------

nano /picogui /src /java /org /picocontainer /gui /swing

ExecuteContainerAction.java removed after 1.2

diff -N ExecuteContainerAction.java
--- ExecuteContainerAction.java 16 Sep 2003 08:45:49 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,55 +0,0 @@

-package org.picocontainer.gui.swing;
-
-import org.picocontainer.gui.model.*;
-import org.picocontainer.MutablePicoContainer;
-
-import javax.swing.*;
-import javax.swing.event.TreeSelectionListener;
-import javax.swing.event.TreeSelectionEvent;
-import java.awt.event.ActionEvent;
-
-/**
- * Action that adds a new component. Enables itself if a container node
- * is selected and the current classname is a loadabe class. Otherwise
- * disabled.
- *
- * @author Aslak Helles&oslash;y
- * @version $Revision: 1.2 $
- */
-public class ExecuteContainerAction extends AbstractAction implements TreeSelectionListener {
- private ContainerNode selectedContainerNode = null;
- private JTree treeToListenTo;
-
- public ExecuteContainerAction(JTree treeToListenTo) {
- super("Execute PicoContainer");
- this.treeToListenTo = treeToListenTo;
- treeToListenTo.addTreeSelectionListener(this);
- setEnabled();
- }
-
- public void actionPerformed(ActionEvent evt) {
- try {
- // will call execute() on the components. Cuz we have such a smart,
- // chained componentadapter
- MutablePicoContainer picoContainer = selectedContainerNode.createPicoContainer();
- picoContainer.getComponentInstances();
- } catch (Exception e) {
- JOptionPane.showMessageDialog(treeToListenTo,e.getStackTrace(),e.getClass().getName() + " " + e.getMessage(), JOptionPane.ERROR_MESSAGE);
- }
- }
-
- public void valueChanged(TreeSelectionEvent evt) {
- Object selected = evt.getPath().getLastPathComponent();
- if(selected instanceof ContainerNode) {
- selectedContainerNode = (ContainerNode) selected;
- setEnabled();
- } else {
- selectedContainerNode = null;
- setEnabled();
- }
- }
-
- private void setEnabled() {
- setEnabled(selectedContainerNode != null && selectedContainerNode.getChildCount() > 0);
- }
-}

\ No newline at end of file

----------

nano /picogui /src /java /org /picocontainer /gui /swing

PicoGui.java removed after 1.6

diff -N PicoGui.java
--- PicoGui.java 19 Sep 2003 22:59:46 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,120 +0,0 @@

-package org.picocontainer.gui.swing;
-
-import org.picocontainer.gui.model.*;
-import org.picocontainer.PicoContainer;
-import org.picocontainer.MutablePicoContainer;
-import org.picocontainer.defaults.DefaultPicoContainer;
-
-import javax.swing.*;
-import javax.swing.text.Document;
-import javax.swing.text.PlainDocument;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.TreeCellEditor;
-import javax.swing.tree.DefaultTreeCellEditor;
-import javax.swing.tree.TreeModel;
-import java.awt.*;
-import java.util.EventObject;
-
-/**
- * @author Aslak Helles&oslash;y
- * @version $Revision: 1.6 $
- */
-public class PicoGui extends JPanel {
-
- public PicoGui(PicoContainer picoContainer) {
- super(new BorderLayout());
-
-// ContainerNode rootNode = new ContainerNode();
-
- JSplitPane split = new JSplitPane();
- JPanel left = new JPanel(new BorderLayout());
-
- TreeModel treeModel = new PicoTreeModel(picoContainer);
- final JTree tree = new JTree(treeModel);
-
- new TreeExpander(tree);
-
- PicoTreeCellRenderer picoTreeCellRenderer = new PicoTreeCellRenderer();
- tree.setCellRenderer(picoTreeCellRenderer);
-
- new DefaultTreeCellEditor(tree, picoTreeCellRenderer, null) {
- };
-
- left.add(new JScrollPane(tree), BorderLayout.CENTER);
-
- JTable table = new JTable(BeanPropertyTableModel.EMPTY_MODEL);
-
- // Set up a ComponentRegistrar
- ComponentRegistrar componentRegistrar = new ComponentRegistrar(treeModel, table);
-
- // Set up a PropertyTableCommander
- new PropertyTableCommander(tree, componentRegistrar);
-
- // Set up an AddPicoComponentAction
- Document componentImplementationDocument = new PlainDocument();
- AddPicoComponentAction addPicoComponentAction = new AddPicoComponentAction(
- componentRegistrar,
- tree,
- tree,
- componentImplementationDocument);
-
- ExecuteContainerAction executeContainerAction = new ExecuteContainerAction(tree);
-
- // Set up an AddPicoContainerAction
- AddPicoContainerAction addPicoContainerAction = new AddPicoContainerAction(tree, treeModel, tree);
-
- EditContainerPanel editContainerPanel = new EditContainerPanel(
- addPicoComponentAction,
- addPicoContainerAction,
- executeContainerAction,
- componentImplementationDocument
- );
- left.add(editContainerPanel, BorderLayout.NORTH);
-
- JPanel right = new JPanel(new BorderLayout());
-
- right.add(new JScrollPane(table), BorderLayout.CENTER);
-
- split.setTopComponent(left);
- split.setBottomComponent(right);
- split.setOrientation(JSplitPane.VERTICAL_SPLIT);
-
- add(split, BorderLayout.CENTER);
- }
-
- public static void main(String[] args) {
- MutablePicoContainer root = new DefaultPicoContainer();
- MutablePicoContainer child = new DefaultPicoContainer();
- root.addChild(child);
- root.registerComponentImplementation(A.class);
-
- PicoGui gui = new PicoGui(root);
-
- JFrame f = new JFrame();
- f.getContentPane().add(gui);
-
- f.setVisible(true);
- f.pack();
- }
-
- public static class A {
- private String message;
-
- public void execute() {
- System.out.println(message);
- }
-
- public A() {
- System.out.println("A a = new A()");
- }
-
- public void setMessage(String message) {
- this.message = message;
- System.out.println("a.setMessage(" + message + ")");
- }
-
- public String getMessage() {
- return message;
- }
- }
-}

----------

nano /picogui /src /java /org /picocontainer /gui /swing

PicoTreeCellRenderer.java removed after 1.8

diff -N PicoTreeCellRenderer.java
--- PicoTreeCellRenderer.java 19 Sep 2003 22:59:46 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,56 +0,0 @@

-package org.picocontainer.gui.swing;
-
-import org.picocontainer.gui.model.ComponentNode;
-import org.picocontainer.gui.model.BeanPropertyModel;
-import org.picocontainer.gui.model.ContainerNode;
-import org.picocontainer.gui.model.BeanPropertyTableModel;
-import org.picocontainer.PicoContainer;
-import org.picocontainer.ComponentAdapter;
-
-import javax.swing.tree.DefaultTreeCellRenderer;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.*;
-import java.awt.*;
-import java.beans.BeanInfo;
-import java.beans.Introspector;
-
-/**
- * @author Aslak Helles&oslash;y
- * @version $Revision: 1.8 $
- */
-public class PicoTreeCellRenderer extends DefaultTreeCellRenderer {
- private final Icon picoContainerIcon = new ImageIcon(getClass().getResource("picocontainer.gif"));
- private final Icon defaultComponentIcon = new ImageIcon(getClass().getResource("defaultcomponent.gif"));
-
- public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) {
- JLabel label = (JLabel) super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus);
- if( value instanceof ComponentNode ) {
- BeanPropertyModel beanPropertyModel = (BeanPropertyModel) ((ComponentNode)value).getUserObject();
- Class componentImplementation = beanPropertyModel.getBeanClass();
- label.setText(componentImplementation.getName());
- try {
- BeanInfo beanInfo = Introspector.getBeanInfo(componentImplementation);
- Image image = beanInfo.getIcon(BeanInfo.ICON_COLOR_16x16);
- Icon icon;
- if(image != null) {
- icon = new ImageIcon(image);
- } else {
- icon = defaultComponentIcon;
- }
- label.setIcon(icon);
- } catch (Exception e) {
- JOptionPane.showMessageDialog(tree, e.getStackTrace());
- }
- } else if(value instanceof PicoContainer) {
- label.setText("PicoContainer");
- label.setIcon(picoContainerIcon);
- } else if(value instanceof ComponentAdapter){
-// BeanPropertyTableModel beanPropertyTableModel = (BeanPropertyTableModel) ((DefaultMutableTreeNode)value).getUserObject();
-// return new JScrollPane( new JTable(beanPropertyTableModel));
- ComponentAdapter componentAdapter = (ComponentAdapter) value;
-
- label.setText(componentAdapter.getComponentImplementation().getName());
- }
- return label;
- }
-}

----------

nano /picogui /src /java /org /picocontainer /gui /swing

PicoTreeModel.java removed after 1.2

diff -N PicoTreeModel.java
--- PicoTreeModel.java 20 Sep 2003 21:57:08 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,77 +0,0 @@

-package org.picocontainer.gui.swing;
-
-import org.picocontainer.PicoContainer;
-
-import javax.swing.tree.TreeModel;
-import javax.swing.tree.TreePath;
-import javax.swing.event.TreeModelListener;
-import java.util.List;
-import java.util.ArrayList;
-
-/**
- * @author Aslak Helles&oslash;y
- * @version $Revision: 1.2 $
- */
-public class PicoTreeModel implements TreeModel {
- private final PicoContainer picoContainer;
-
- public PicoTreeModel(PicoContainer picoContainer) {
- this.picoContainer = picoContainer;
- }
-
- // TreeModel interface
-
- public Object getRoot() {
- return picoContainer;
- }
-
- public int getChildCount(Object parent) {
- if (parent instanceof PicoContainer) {
- PicoContainer pico = (PicoContainer) parent;
- return pico.getChildContainers().size() + picoContainer.getComponentKeys().size();
- } else {
- return 0;
- }
- }
-
- public boolean isLeaf(Object node) {
- return !(node instanceof PicoContainer);
- }
-
- public void addTreeModelListener(TreeModelListener l) {
-
- }
-
- public void removeTreeModelListener(TreeModelListener l) {
-
- }
-
- public Object getChild(Object parent, int index) {
- PicoContainer pico = (PicoContainer) parent;
- List children = new ArrayList(pico.getChildContainers());
- List componentKeys = new ArrayList(pico.getComponentKeys());
-
- if (index < children.size()) {
- return children.get(index);
- } else {
- Object componentKey = componentKeys.get(index - children.size());
- return pico.findComponentAdapter(componentKey);
- }
- }
-
- public int getIndexOfChild(Object parent, Object child) {
- PicoContainer pico = (PicoContainer) parent;
- List children = new ArrayList(pico.getChildContainers());
- List componentKeys = new ArrayList(pico.getComponentKeys());
-
- if (child instanceof PicoContainer) {
- return children.indexOf(child);
- } else {
- return componentKeys.indexOf(child) + children.size();
- }
- }
-
- public void valueForPathChanged(TreePath path, Object newValue) {
-
- }
-}

----------

nano /picogui /src /java /org /picocontainer /gui /swing

PropertyTableCommander.java removed after 1.5

diff -N PropertyTableCommander.java
--- PropertyTableCommander.java 11 Sep 2003 19:17:16 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@

-package org.picocontainer.gui.swing;
-
-import org.picocontainer.gui.model.ComponentNode;
-import org.picocontainer.gui.model.BeanPropertyTableModel;
-import org.picocontainer.gui.model.BeanPropertyModel;
-
-import javax.swing.*;
-import javax.swing.event.TreeSelectionListener;
-import javax.swing.event.TreeSelectionEvent;
-import java.util.Map;
-import java.util.HashMap;
-
-/**
- * @author Aslak Helles&oslash;y
- * @version $Revision: 1.5 $
- */
-public class PropertyTableCommander implements TreeSelectionListener {
-
- private final ComponentRegistrar componentRegistrar;
-
- public PropertyTableCommander(JTree tree, ComponentRegistrar componentRegistrar){
- this.componentRegistrar = componentRegistrar;
- tree.addTreeSelectionListener(this);
- }
-
- public void valueChanged(TreeSelectionEvent evt) {
- Object selected = evt.getPath().getLastPathComponent();
- if(selected instanceof ComponentNode) {
- ComponentNode componentTreeNode = (ComponentNode) selected;
- BeanPropertyModel beanPropertyModel = (BeanPropertyModel) componentTreeNode.getUserObject();
- componentRegistrar.displayInPropertyTable(beanPropertyModel);
- }
- }
-}

----------

nano /picogui /src /java /org /picocontainer /gui /swing

TreeExpander.java removed after 1.1

diff -N TreeExpander.java
--- TreeExpander.java 16 Sep 2003 23:08:10 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,48 +0,0 @@

-package org.picocontainer.gui.swing;
-
-import javax.swing.event.TreeModelListener;
-import javax.swing.event.TreeModelEvent;
-import javax.swing.tree.TreePath;
-import javax.swing.*;
-
-/**
- * This class makes sure new nodes are expanded and selected.
- *
- * @pico
- * @author Aslak Helles&oslash;y
- * @version $Revision: 1.1 $
- */
-public class TreeExpander implements TreeModelListener {
-
- private final JTree tree;
-
- public TreeExpander(JTree tree) {
- this.tree = tree;
- tree.getModel().addTreeModelListener(this);
- }
-
- public void treeNodesInserted(final TreeModelEvent evt) {
- Object[] children = evt.getChildren();
- final TreePath[] childPaths = new TreePath[children.length];
-
- for (int i = 0; i < children.length; i++) {
- Object child = children[i];
- childPaths[i] = evt.getTreePath().pathByAddingChild(child);
- }
-
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- tree.setSelectionPaths(childPaths);
- }
- });
- }
-
- public void treeNodesChanged(TreeModelEvent evt) {
- }
-
- public void treeNodesRemoved(TreeModelEvent evt) {
- }
-
- public void treeStructureChanged(TreeModelEvent evt) {
- }
-}

----------

nano /picogui /src /java /org /picocontainer /gui /swing

package.html removed after 1.1

diff -N package.html
--- package.html 2 Sep 2003 00:18:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@

-<body>
-Configuration panel in Swing that can be used in IDE plugins.
-</body>