From 5664fd4644c78f4571a1a72e6b9f0511fb10720a Mon Sep 17 00:00:00 2001 From: abranson Date: Tue, 2 Aug 2011 22:10:28 +0200 Subject: Finished move to generics. Enforced 1.6 compliance for now. No errors or warnings :) --- source/com/c2kernel/gui/EntityDetails.java | 2 +- source/com/c2kernel/gui/EntityTabManager.java | 4 +-- source/com/c2kernel/gui/MainFrame.java | 2 +- source/com/c2kernel/gui/MenuBuilder.java | 2 +- source/com/c2kernel/gui/data/Node.java | 4 +-- source/com/c2kernel/gui/data/NodeAgent.java | 4 +-- source/com/c2kernel/gui/data/NodeEntity.java | 4 +-- source/com/c2kernel/gui/data/NodeItem.java | 6 ++-- source/com/c2kernel/gui/tabs/DomainPathAdmin.java | 6 ++-- source/com/c2kernel/gui/tabs/HistoryPane.java | 2 +- source/com/c2kernel/gui/tabs/JobListPane.java | 2 +- source/com/c2kernel/gui/tabs/PropertiesPane.java | 4 +-- source/com/c2kernel/gui/tabs/ViewpointPane.java | 35 ++++++++++++---------- .../tabs/collection/CollectionHistoryWindow.java | 8 ++--- .../c2kernel/gui/tabs/execution/ActivityItem.java | 2 +- .../gui/tabs/execution/ActivityViewer.java | 2 +- .../gui/tabs/outcome/form/AttributeList.java | 2 +- .../c2kernel/gui/tabs/outcome/form/Dimension.java | 4 +-- .../gui/tabs/outcome/form/DimensionTableModel.java | 18 +++++------ .../gui/tabs/outcome/form/OutcomeStructure.java | 6 ++-- .../tabs/outcome/form/field/ArrayTableModel.java | 4 +-- 21 files changed, 63 insertions(+), 60 deletions(-) mode change 100755 => 100644 source/com/c2kernel/gui/EntityDetails.java mode change 100755 => 100644 source/com/c2kernel/gui/EntityTabManager.java mode change 100755 => 100644 source/com/c2kernel/gui/MainFrame.java mode change 100755 => 100644 source/com/c2kernel/gui/MenuBuilder.java mode change 100755 => 100644 source/com/c2kernel/gui/data/Node.java mode change 100755 => 100644 source/com/c2kernel/gui/data/NodeAgent.java mode change 100755 => 100644 source/com/c2kernel/gui/data/NodeEntity.java mode change 100755 => 100644 source/com/c2kernel/gui/data/NodeItem.java mode change 100755 => 100644 source/com/c2kernel/gui/tabs/DomainPathAdmin.java mode change 100755 => 100644 source/com/c2kernel/gui/tabs/HistoryPane.java mode change 100755 => 100644 source/com/c2kernel/gui/tabs/JobListPane.java mode change 100755 => 100644 source/com/c2kernel/gui/tabs/PropertiesPane.java mode change 100755 => 100644 source/com/c2kernel/gui/tabs/ViewpointPane.java mode change 100755 => 100644 source/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java mode change 100755 => 100644 source/com/c2kernel/gui/tabs/execution/ActivityViewer.java mode change 100755 => 100644 source/com/c2kernel/gui/tabs/outcome/form/AttributeList.java mode change 100755 => 100644 source/com/c2kernel/gui/tabs/outcome/form/Dimension.java mode change 100755 => 100644 source/com/c2kernel/gui/tabs/outcome/form/DimensionTableModel.java mode change 100755 => 100644 source/com/c2kernel/gui/tabs/outcome/form/OutcomeStructure.java mode change 100755 => 100644 source/com/c2kernel/gui/tabs/outcome/form/field/ArrayTableModel.java (limited to 'source/com/c2kernel/gui') diff --git a/source/com/c2kernel/gui/EntityDetails.java b/source/com/c2kernel/gui/EntityDetails.java old mode 100755 new mode 100644 index b6c5245..5eb812f --- a/source/com/c2kernel/gui/EntityDetails.java +++ b/source/com/c2kernel/gui/EntityDetails.java @@ -30,7 +30,7 @@ public class EntityDetails extends JPanel implements ChangeListener, Runnable { protected JPanel itemTitlePanel; private EntityTabManager desktopManager; protected NodeEntity myEntity; - protected HashMap childPanes = new HashMap(); + protected HashMap childPanes = new HashMap(); protected String startTab; protected String startCommand = null; protected boolean initialized = false; diff --git a/source/com/c2kernel/gui/EntityTabManager.java b/source/com/c2kernel/gui/EntityTabManager.java old mode 100755 new mode 100644 index 208ae89..1e01ad0 --- a/source/com/c2kernel/gui/EntityTabManager.java +++ b/source/com/c2kernel/gui/EntityTabManager.java @@ -22,7 +22,7 @@ public class EntityTabManager extends JPanel { private MainFrame mMainframe; - protected HashMap openItems = new HashMap(); + protected HashMap openItems = new HashMap(); protected JTabbedPaneWithCloseIcons tabbedPane = new JTabbedPaneWithCloseIcons(); //JTabbedPane tabbedPane = new JTabbedPane(); MenuBuilder myMenuBuilder; @@ -74,7 +74,7 @@ public class EntityTabManager extends JPanel } public void closeAll(boolean keepOpen) { - ArrayList toRemove = new ArrayList(); + ArrayList toRemove = new ArrayList(); for (Iterator iter = openItems.keySet().iterator(); iter.hasNext();) { Integer element = (Integer) iter.next(); if (keepOpen && openItems.get(element).equals(tabbedPane.getSelectedComponent())) continue; diff --git a/source/com/c2kernel/gui/MainFrame.java b/source/com/c2kernel/gui/MainFrame.java old mode 100755 new mode 100644 index 99a1fab..e561f1f --- a/source/com/c2kernel/gui/MainFrame.java +++ b/source/com/c2kernel/gui/MainFrame.java @@ -267,7 +267,7 @@ public class MainFrame extends javax.swing.JFrame { } public static JComboBox getExecutionPlugins() { - JComboBox plugins = new JComboBox(); + JComboBox plugins = new JComboBox(); // create execution selector Executor defaultExecutor = new DefaultExecutor(); plugins.addItem(defaultExecutor); diff --git a/source/com/c2kernel/gui/MenuBuilder.java b/source/com/c2kernel/gui/MenuBuilder.java old mode 100755 new mode 100644 index c385dbe..bf27287 --- a/source/com/c2kernel/gui/MenuBuilder.java +++ b/source/com/c2kernel/gui/MenuBuilder.java @@ -33,7 +33,7 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene protected JMenu styleMenu; protected JMenu prefMenu; protected JMenu helpMenu; - protected HashMap availableMenus = new HashMap(); + protected HashMap availableMenus = new HashMap(); public MenuBuilder() {} diff --git a/source/com/c2kernel/gui/data/Node.java b/source/com/c2kernel/gui/data/Node.java old mode 100755 new mode 100644 index b82ee92..79eb3ad --- a/source/com/c2kernel/gui/data/Node.java +++ b/source/com/c2kernel/gui/data/Node.java @@ -31,8 +31,8 @@ public abstract class Node implements Runnable { protected String type = ""; protected Icon icon; protected boolean isExpandable = false; - protected HashMap childNodes = new HashMap(); - protected ArrayList subscribers = new ArrayList(); + protected HashMap childNodes = new HashMap(); + protected ArrayList subscribers = new ArrayList(); protected DynamicTreeBuilder loader = null; private boolean loaded = false; private String iconName; diff --git a/source/com/c2kernel/gui/data/NodeAgent.java b/source/com/c2kernel/gui/data/NodeAgent.java old mode 100755 new mode 100644 index 9ef738a..138b576 --- a/source/com/c2kernel/gui/data/NodeAgent.java +++ b/source/com/c2kernel/gui/data/NodeAgent.java @@ -21,9 +21,9 @@ public class NodeAgent extends NodeEntity { public void loadChildren() { } - public ArrayList getTabs() { + public ArrayList getTabs() { - ArrayList requiredTabs = super.getTabs(); + ArrayList requiredTabs = super.getTabs(); requiredTabs.add("AgentProperties"); requiredTabs.add("JobList"); return requiredTabs; diff --git a/source/com/c2kernel/gui/data/NodeEntity.java b/source/com/c2kernel/gui/data/NodeEntity.java old mode 100755 new mode 100644 index adff241..8c05afd --- a/source/com/c2kernel/gui/data/NodeEntity.java +++ b/source/com/c2kernel/gui/data/NodeEntity.java @@ -73,8 +73,8 @@ public abstract class NodeEntity extends Node { desktop.add(this); } - public ArrayList getTabs() { - ArrayList requiredTabs = new ArrayList(); + public ArrayList getTabs() { + ArrayList requiredTabs = new ArrayList(); return requiredTabs; } } diff --git a/source/com/c2kernel/gui/data/NodeItem.java b/source/com/c2kernel/gui/data/NodeItem.java old mode 100755 new mode 100644 index 410f13a..84cba97 --- a/source/com/c2kernel/gui/data/NodeItem.java +++ b/source/com/c2kernel/gui/data/NodeItem.java @@ -53,7 +53,7 @@ public class NodeItem extends NodeEntity { popup.addSeparator(); try { ArrayList jobList = ((ItemProxy)myEntity).getJobList(MainFrame.userAgent); - ArrayList already = new ArrayList(); + ArrayList already = new ArrayList(); if (jobList.size() > 0) { for (Iterator e = jobList.iterator(); e.hasNext();) { Job thisJob = (Job)e.next(); @@ -91,9 +91,9 @@ public class NodeItem extends NodeEntity { thisDetail.runCommand("Execution", stepName); } - public ArrayList getTabs() { + public ArrayList getTabs() { - ArrayList requiredTabs = super.getTabs(); + ArrayList requiredTabs = super.getTabs(); requiredTabs.add("Properties"); try { String collNames = myEntity.queryData(ClusterStorage.COLLECTION+"/all"); diff --git a/source/com/c2kernel/gui/tabs/DomainPathAdmin.java b/source/com/c2kernel/gui/tabs/DomainPathAdmin.java old mode 100755 new mode 100644 index 35104d7..2e81121 --- a/source/com/c2kernel/gui/tabs/DomainPathAdmin.java +++ b/source/com/c2kernel/gui/tabs/DomainPathAdmin.java @@ -102,11 +102,11 @@ public class DomainPathAdmin extends Box implements ActionListener { } private class DomainPathTableModel extends AbstractTableModel { - ArrayList domPaths; + ArrayList domPaths; DomainPathAdmin parent; public DomainPathTableModel(DomainPathAdmin parent) { this.parent = parent; - domPaths = new ArrayList(); + domPaths = new ArrayList(); } public void loadPaths() { @@ -134,7 +134,7 @@ public class DomainPathAdmin extends Box implements ActionListener { } } - public Class getColumnClass(int columnIndex) { + public Class getColumnClass(int columnIndex) { return String.class; } diff --git a/source/com/c2kernel/gui/tabs/HistoryPane.java b/source/com/c2kernel/gui/tabs/HistoryPane.java old mode 100755 new mode 100644 index 091ef5e..be7f8b2 --- a/source/com/c2kernel/gui/tabs/HistoryPane.java +++ b/source/com/c2kernel/gui/tabs/HistoryPane.java @@ -182,7 +182,7 @@ public class HistoryPane extends EntityTabPane implements ActionListener, Entity /** * @see javax.swing.table.TableModel#getColumnClass(int) */ - public Class getColumnClass(int columnIndex) { + public Class getColumnClass(int columnIndex) { switch(columnIndex) { case 0: return Integer.class; diff --git a/source/com/c2kernel/gui/tabs/JobListPane.java b/source/com/c2kernel/gui/tabs/JobListPane.java old mode 100755 new mode 100644 index ea14222..b9ff0e5 --- a/source/com/c2kernel/gui/tabs/JobListPane.java +++ b/source/com/c2kernel/gui/tabs/JobListPane.java @@ -209,7 +209,7 @@ public class JobListPane extends EntityTabPane implements ActionListener, Entity /** * @see javax.swing.table.TableModel#getColumnClass(int) */ - public Class getColumnClass(int columnIndex) { + public Class getColumnClass(int columnIndex) { switch(columnIndex) { case 0: return Integer.class; diff --git a/source/com/c2kernel/gui/tabs/PropertiesPane.java b/source/com/c2kernel/gui/tabs/PropertiesPane.java old mode 100755 new mode 100644 index 5666ae9..6b21804 --- a/source/com/c2kernel/gui/tabs/PropertiesPane.java +++ b/source/com/c2kernel/gui/tabs/PropertiesPane.java @@ -40,7 +40,7 @@ public class PropertiesPane extends EntityTabPane implements EntityProxyObserver Box propertyBox; boolean subbed = false; - HashMap loadedProps = new HashMap(); + HashMap loadedProps = new HashMap(); JLabel domTitle; DomainPathAdmin domAdmin; @@ -89,7 +89,7 @@ public class PropertiesPane extends EntityTabPane implements EntityProxyObserver public void reload() { Gateway.getStorage().clearCache(sourceEntity.getSysKey(), ClusterStorage.PROPERTY); - loadedProps = new HashMap(); + loadedProps = new HashMap(); initForEntity(sourceEntity); } diff --git a/source/com/c2kernel/gui/tabs/ViewpointPane.java b/source/com/c2kernel/gui/tabs/ViewpointPane.java old mode 100755 new mode 100644 index 7bb6176..31e18c3 --- a/source/com/c2kernel/gui/tabs/ViewpointPane.java +++ b/source/com/c2kernel/gui/tabs/ViewpointPane.java @@ -10,6 +10,7 @@ import java.awt.event.ItemListener; import java.io.File; import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.Iterator; import java.util.StringTokenizer; @@ -40,16 +41,16 @@ import com.c2kernel.utils.Logger; public class ViewpointPane extends EntityTabPane implements ItemListener, ActionListener, EntityProxyObserver { - JComboBox schemas; - JComboBox views; - JComboBox events; + JComboBox schemas; + JComboBox views; + JComboBox events; JLabel eventDetails; JButton exportButton; JButton viewButton; - ArrayList schemaList; - ArrayList viewpointList; - ArrayList eventList; + ArrayList schemaList; + ArrayList viewpointList; + ArrayList eventList; String currentSchema = null; Outcome currentOutcome = null; OutcomeHandler thisOutcome; @@ -82,7 +83,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action viewBox.add(label); viewBox.add(Box.createHorizontalStrut(7)); - schemas = new JComboBox(); + schemas = new JComboBox(); viewBox.add(schemas); viewBox.add(Box.createHorizontalGlue()); schemas.addItemListener(this); @@ -91,7 +92,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action viewBox.add(label); viewBox.add(Box.createHorizontalStrut(7)); - views = new JComboBox(); + views = new JComboBox(); viewBox.add(views); viewBox.add(Box.createHorizontalGlue()); views.addItemListener(this); @@ -107,7 +108,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action eventBox.add(label); eventBox.add(Box.createHorizontalStrut(7)); - events = new JComboBox(); + events = new JComboBox(); eventBox.add(events); eventBox.add(Box.createHorizontalStrut(7)); events.addItemListener(this); @@ -163,7 +164,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action clearView(); schemas.addItem("--"); currentSchema = null; - schemaList = new ArrayList(); + schemaList = new ArrayList(); try { String outcomeTypes = sourceEntity.getEntity().queryData(ClusterStorage.VIEWPOINT+"/all"); StringTokenizer tok = new StringTokenizer(outcomeTypes, ","); @@ -197,8 +198,8 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action suspendSelection = true; views.removeAllItems(); events.removeAllItems(); - viewpointList = new ArrayList(); - eventList = new ArrayList(); + viewpointList = new ArrayList(); + eventList = new ArrayList(); currentSchema = schemaName; @@ -233,8 +234,12 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action } eventList.add(newEvent); } - Collections.sort(eventList); - for (Iterator iter = eventList.iterator(); iter.hasNext();) + Collections.sort(eventList, new Comparator() { + public int compare(EventItem o1, EventItem o2) { + return o1.compareTo(o2); + } + }); + for (Iterator iter = eventList.iterator(); iter.hasNext();) events.addItem(iter.next()); } @@ -435,7 +440,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action class EventItem implements Comparable { public int eventId; public int schemaVersion; - public ArrayList viewNames = new ArrayList(); + public ArrayList viewNames = new ArrayList(); public String viewList = ""; public EventItem(int eventId, int schemaVersion) { diff --git a/source/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java b/source/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java old mode 100755 new mode 100644 index ef20a1a..bb71cd8 --- a/source/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java +++ b/source/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java @@ -48,17 +48,16 @@ public class CollectionHistoryWindow extends JFrame { private class HistoryTableModel extends AbstractTableModel implements EntityProxyObserver { ItemProxy item; - ArrayList collEvents, collEventData; + ArrayList collEvents, collEventData; Collection coll; public HistoryTableModel(ItemProxy item, Collection coll) { this.item = item; this.coll = coll; - collEvents = new ArrayList(); - collEventData = new ArrayList(); + collEvents = new ArrayList(); + collEventData = new ArrayList(); item.subscribe(this, ClusterStorage.HISTORY, true); } public int getColumnCount() { - // TODO Auto-generated method stub return 4; } @@ -72,7 +71,6 @@ public class CollectionHistoryWindow extends JFrame { } } public int getRowCount() { - // TODO Auto-generated method stub return collEvents.size(); } public Object getValueAt(int rowIndex, int columnIndex) { diff --git a/source/com/c2kernel/gui/tabs/execution/ActivityItem.java b/source/com/c2kernel/gui/tabs/execution/ActivityItem.java index 051f1dc..ba5e76b 100644 --- a/source/com/c2kernel/gui/tabs/execution/ActivityItem.java +++ b/source/com/c2kernel/gui/tabs/execution/ActivityItem.java @@ -8,7 +8,7 @@ public class ActivityItem { public String stepPath; public int state; public String name; - ArrayList jobs = new ArrayList<>(); + ArrayList jobs = new ArrayList(); public ActivityItem() { stepPath = ""; diff --git a/source/com/c2kernel/gui/tabs/execution/ActivityViewer.java b/source/com/c2kernel/gui/tabs/execution/ActivityViewer.java old mode 100755 new mode 100644 index 4250a37..b0417f4 --- a/source/com/c2kernel/gui/tabs/execution/ActivityViewer.java +++ b/source/com/c2kernel/gui/tabs/execution/ActivityViewer.java @@ -40,7 +40,7 @@ public class ActivityViewer extends JPanel implements Runnable { OutcomeHandler outcomePanel; JPanel outcomeView = new JPanel(new GridLayout(1,1)); ActivityItem thisAct; - ArrayList requestButtons = new ArrayList(); + ArrayList requestButtons = new ArrayList(); JLabel noOutcome = new JLabel(Language.translate("No outcome data is required for this activity")); ExecutionPane parent; JLabel status; diff --git a/source/com/c2kernel/gui/tabs/outcome/form/AttributeList.java b/source/com/c2kernel/gui/tabs/outcome/form/AttributeList.java old mode 100755 new mode 100644 index 08c5ea1..015bd9a --- a/source/com/c2kernel/gui/tabs/outcome/form/AttributeList.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/AttributeList.java @@ -22,7 +22,7 @@ import com.c2kernel.utils.Logger; public class AttributeList extends JPanel { - ArrayList attrSet = new ArrayList(); + ArrayList attrSet = new ArrayList(); ElementDecl model; Element myElement; boolean readOnly; diff --git a/source/com/c2kernel/gui/tabs/outcome/form/Dimension.java b/source/com/c2kernel/gui/tabs/outcome/form/Dimension.java old mode 100755 new mode 100644 index 8dfa7f5..8de306b --- a/source/com/c2kernel/gui/tabs/outcome/form/Dimension.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/Dimension.java @@ -36,8 +36,8 @@ public class Dimension extends OutcomeStructure implements ActionListener { JLabel msg; DomKeyPushTable table; Box tableBox; - ArrayList instances = new ArrayList(); // stores DimensionInstances if tabs - ArrayList elements = new ArrayList(); // stores current children + ArrayList instances = new ArrayList(); // stores DimensionInstances if tabs + ArrayList elements = new ArrayList(); // stores current children JButton addButton; JButton delButton; diff --git a/source/com/c2kernel/gui/tabs/outcome/form/DimensionTableModel.java b/source/com/c2kernel/gui/tabs/outcome/form/DimensionTableModel.java old mode 100755 new mode 100644 index b19c1d2..1a606fb --- a/source/com/c2kernel/gui/tabs/outcome/form/DimensionTableModel.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/DimensionTableModel.java @@ -14,13 +14,13 @@ import com.c2kernel.utils.Logger; public class DimensionTableModel extends AbstractTableModel { ElementDecl model; - ArrayList columnHeadings = new ArrayList(); - ArrayList columnClasses = new ArrayList(); - ArrayList columnDecls = new ArrayList(); - ArrayList colReadOnly = new ArrayList(); - ArrayList colHelp = new ArrayList(); - ArrayList rows = new ArrayList(); - ArrayList elements = new ArrayList(); + ArrayList columnHeadings = new ArrayList(); + ArrayList> columnClasses = new ArrayList>(); + ArrayList columnDecls = new ArrayList(); + ArrayList colReadOnly = new ArrayList(); + ArrayList colHelp = new ArrayList(); + ArrayList rows = new ArrayList(); + ArrayList elements = new ArrayList(); boolean readOnly; public DimensionTableModel(ElementDecl model, boolean readOnly) throws StructuralException { @@ -176,8 +176,8 @@ public class DimensionTableModel extends AbstractTableModel { rows.add(index, newRow); fireTableRowsInserted(index, index); } - public Class getColumnClass(int columnIndex) { - return (Class)columnClasses.get(columnIndex); + public Class getColumnClass(int columnIndex) { + return columnClasses.get(columnIndex); } public String getColumnName(int columnIndex) { diff --git a/source/com/c2kernel/gui/tabs/outcome/form/OutcomeStructure.java b/source/com/c2kernel/gui/tabs/outcome/form/OutcomeStructure.java old mode 100755 new mode 100644 index 9333bf8..a535da6 --- a/source/com/c2kernel/gui/tabs/outcome/form/OutcomeStructure.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/OutcomeStructure.java @@ -36,8 +36,8 @@ public abstract class OutcomeStructure extends JPanel { ElementDecl model; Element myElement = null; boolean readOnly; - HashMap subStructure = new HashMap(); - ArrayList order = new ArrayList(); + HashMap subStructure = new HashMap(); + ArrayList order = new ArrayList(); String help = ""+Language.translate("No help is available for this element")+""; HelpPane helpPane; boolean deferChild = false; @@ -46,7 +46,7 @@ public abstract class OutcomeStructure extends JPanel { this.model = model; this.readOnly = readOnly; this.helpPane = helpPane; - subStructure = new HashMap(); + subStructure = new HashMap(); Logger.msg(8, "Creating " + model.getName() + " structure as " + this.getClass().getName().substring(this.getClass().getName().lastIndexOf('.') + 1)); diff --git a/source/com/c2kernel/gui/tabs/outcome/form/field/ArrayTableModel.java b/source/com/c2kernel/gui/tabs/outcome/form/field/ArrayTableModel.java old mode 100755 new mode 100644 index 0807f78..c7934c0 --- a/source/com/c2kernel/gui/tabs/outcome/form/field/ArrayTableModel.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/field/ArrayTableModel.java @@ -22,7 +22,7 @@ import com.c2kernel.utils.Language; public class ArrayTableModel extends AbstractTableModel { - ArrayList contents = new ArrayList(); + ArrayList contents = new ArrayList(); Class type; int numCols = 1; boolean readOnly = false; @@ -63,7 +63,7 @@ public class ArrayTableModel extends AbstractTableModel { fireTableStructureChanged(); } - public Class getColumnClass(int columnIndex) { + public Class getColumnClass(int columnIndex) { return type; } -- cgit v1.2.3