From 0ec8481c10cd8277d84c7c1a785483a0a739e5a0 Mon Sep 17 00:00:00 2001 From: abranson Date: Thu, 4 Aug 2011 00:42:34 +0200 Subject: More code cleanup: Refactored Entity Proxy Subscription to handle generics better Rewrote RemoteMap to use TreeMap instead of the internal array for order. It now sorts its keys by number if they parse, else as strings. Removed a no-longer-in-progress outcome form class --- .../gui/model/AggregationVertexFactory.java | 6 ++- .../gui/model/AggregationVertexOutlineCreator.java | 3 +- .../gui/view/AggregationMemberRenderer.java | 33 ++++++++-------- .../collection/gui/view/PropertyPanel.java | 13 ++++--- .../collection/gui/view/SelectedMemberPanel.java | 44 ++++++++++++++-------- 5 files changed, 59 insertions(+), 40 deletions(-) mode change 100755 => 100644 source/com/c2kernel/collection/gui/model/AggregationVertexFactory.java mode change 100755 => 100644 source/com/c2kernel/collection/gui/model/AggregationVertexOutlineCreator.java mode change 100755 => 100644 source/com/c2kernel/collection/gui/view/AggregationMemberRenderer.java mode change 100755 => 100644 source/com/c2kernel/collection/gui/view/PropertyPanel.java mode change 100755 => 100644 source/com/c2kernel/collection/gui/view/SelectedMemberPanel.java (limited to 'source/com/c2kernel/collection/gui') diff --git a/source/com/c2kernel/collection/gui/model/AggregationVertexFactory.java b/source/com/c2kernel/collection/gui/model/AggregationVertexFactory.java old mode 100755 new mode 100644 index d99ef3c..cd4963f --- a/source/com/c2kernel/collection/gui/model/AggregationVertexFactory.java +++ b/source/com/c2kernel/collection/gui/model/AggregationVertexFactory.java @@ -17,14 +17,16 @@ public class AggregationVertexFactory implements VertexFactory private Aggregation mAggregation = null; - public void setCreationContext(Object aggregation) + @Override + public void setCreationContext(Object aggregation) { if (aggregation != null && aggregation instanceof Aggregation) mAggregation = (Aggregation)aggregation; } - public void create + @Override + public void create ( GraphModelManager graphModelManager, Point location, diff --git a/source/com/c2kernel/collection/gui/model/AggregationVertexOutlineCreator.java b/source/com/c2kernel/collection/gui/model/AggregationVertexOutlineCreator.java old mode 100755 new mode 100644 index ed19f9c..b28af2e --- a/source/com/c2kernel/collection/gui/model/AggregationVertexOutlineCreator.java +++ b/source/com/c2kernel/collection/gui/model/AggregationVertexOutlineCreator.java @@ -7,7 +7,8 @@ import com.c2kernel.graph.model.VertexOutlineCreator; public class AggregationVertexOutlineCreator implements VertexOutlineCreator { - public void setOutline(Vertex vertex) + @Override + public void setOutline(Vertex vertex) { GraphPoint centre = vertex.getCentrePoint(); int height = vertex.getHeight(); diff --git a/source/com/c2kernel/collection/gui/view/AggregationMemberRenderer.java b/source/com/c2kernel/collection/gui/view/AggregationMemberRenderer.java old mode 100755 new mode 100644 index 0d3cb03..6d41d20 --- a/source/com/c2kernel/collection/gui/view/AggregationMemberRenderer.java +++ b/source/com/c2kernel/collection/gui/view/AggregationMemberRenderer.java @@ -19,31 +19,32 @@ public class AggregationMemberRenderer implements VertexRenderer { private Aggregation mAggregation = null; - + public AggregationMemberRenderer() { } - + public void setAggregation(Aggregation agg) { mAggregation = agg; - } - - - public void draw(Graphics2D g2d, Vertex vertex) + } + + + @Override + public void draw(Graphics2D g2d, Vertex vertex) { GraphPoint centre = vertex.getCentrePoint(); GraphPoint[] outline = vertex.getOutlinePoints(); FontMetrics metrics = g2d.getFontMetrics(); - + AggregationMember memberPair = mAggregation.getMemberPair(vertex.getID()); try - { - String name = memberPair.getEntityName(); + { + String name = memberPair.getEntityName(); - g2d.drawString( name, - centre.x-metrics.stringWidth(name)/2, + g2d.drawString( name, + centre.x-metrics.stringWidth(name)/2, topYOfOutline(outline) ); g2d.drawImage @@ -54,8 +55,8 @@ public class AggregationMemberRenderer implements VertexRenderer null ); - - + + // Draw the outline of the vertex if(outline.length > 1) { @@ -69,7 +70,7 @@ public class AggregationMemberRenderer implements VertexRenderer outline[i+1].y ); } - + g2d.drawLine ( outline[outline.length-1].x, @@ -84,7 +85,7 @@ public class AggregationMemberRenderer implements VertexRenderer catch (Exception ex) { Logger.error("AggregationMemberRenderer::draw() " + ex); - } + } } @@ -104,7 +105,7 @@ public class AggregationMemberRenderer implements VertexRenderer return topY; } - + int bottomYOfOutline(GraphPoint[] outline) { int bottomY = outline[0].y; diff --git a/source/com/c2kernel/collection/gui/view/PropertyPanel.java b/source/com/c2kernel/collection/gui/view/PropertyPanel.java old mode 100755 new mode 100644 index 903ddf9..f566d70 --- a/source/com/c2kernel/collection/gui/view/PropertyPanel.java +++ b/source/com/c2kernel/collection/gui/view/PropertyPanel.java @@ -1,7 +1,7 @@ package com.c2kernel.collection.gui.view; +import com.c2kernel.collection.Aggregation; import com.c2kernel.collection.AggregationMember; -import com.c2kernel.collection.Collection; import com.c2kernel.collection.CollectionMember; import com.c2kernel.common.ObjectNotFoundException; import com.c2kernel.graph.model.Vertex; @@ -9,17 +9,18 @@ import com.c2kernel.graph.view.VertexPropertyPanel; public class PropertyPanel extends VertexPropertyPanel { - Collection mCollection; - + Aggregation mCollection; + public PropertyPanel() { super(); } - - public void setCollection(Collection collection) { + + public void setCollection(Aggregation collection) { mCollection = collection; } - public void setVertex(Vertex vert) { + @Override + public void setVertex(Vertex vert) { try { CollectionMember newMember = mCollection.getMember(vert.getID()); if (newMember instanceof AggregationMember) { diff --git a/source/com/c2kernel/collection/gui/view/SelectedMemberPanel.java b/source/com/c2kernel/collection/gui/view/SelectedMemberPanel.java old mode 100755 new mode 100644 index 5e66c1e..5b59b35 --- a/source/com/c2kernel/collection/gui/view/SelectedMemberPanel.java +++ b/source/com/c2kernel/collection/gui/view/SelectedMemberPanel.java @@ -4,7 +4,14 @@ import java.awt.GridLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import javax.swing.*; +import javax.swing.Box; +import javax.swing.BoxLayout; +import javax.swing.JButton; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JTextField; +import javax.swing.JToggleButton; import com.c2kernel.collection.AggregationMember; import com.c2kernel.collection.MembershipException; @@ -39,22 +46,23 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe SelectedMemberPanel me; AggregationMember selectedMember = null; - + public SelectedMemberPanel() { me=this; setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); - + JPanel attrs = new JPanel(new GridLayout(3,2)); attrs.add(new JLabel(Language.translate("Slot Number:"))); attrs.add(slotNumber); attrs.add(new JLabel(Language.translate("Assigned Member:"))); attrs.add(memberKey); memberKey.setEditable(false); - + add(attrs); add(Box.createVerticalStrut(10)); findButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent ae) { String code = memberKey.getText(); if (code == null || code.length() == 0) @@ -62,9 +70,10 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe MainFrame.itemFinder.pushNewKey(code); } }); - + changeButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent ae) { + @Override + public void actionPerformed(ActionEvent ae) { if (changeButton.getModel().isSelected()) { MainFrame.status.setText(Language.translate("Please scan or type your barcode to assign in the top field")); MainFrame.itemFinder.setConsumer(me, "Assign"); @@ -77,9 +86,10 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe } } }); - + removeButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent ae) { + @Override + public void actionPerformed(ActionEvent ae) { selectedMember.clearEntity(); selectedMember.getProperties().remove("Name"); select(selectedMember); @@ -92,11 +102,12 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe buttonBox.add(changeButton); buttonBox.add(removeButton); } - + setButtons(false); add(buttonBox); } + @Override public void select(Vertex vert) { selectedMember = (AggregationMember)vert; slotNumber.setText(String.valueOf(vert.getID())); @@ -108,10 +119,11 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe } catch (Exception e) { } memberKey.setText(name); setButtons(true); - + revalidate(); } - + + @Override public void clear() { slotNumber.setText(""); memberKey.setText(""); @@ -123,13 +135,14 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe findButton.setEnabled(state); changeButton.getModel().setSelected(false); changeButton.setEnabled(state); - removeButton.setEnabled(state); - MainFrame.itemFinder.clearConsumer(me); + removeButton.setEnabled(state); + MainFrame.itemFinder.clearConsumer(me); } /** * */ - public void push(DomainPath key) { + @Override + public void push(DomainPath key) { MainFrame.status.setText("Assigning entity "+key.getSysKey()+" to slot "+selectedMember.getID()); try { selectedMember.assignEntity(key.getSysKey()); @@ -142,7 +155,8 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe /** * */ - public void push(String name) { + @Override + public void push(String name) { JOptionPane.showMessageDialog(null, "Product is not known in this centre", "Error", JOptionPane.ERROR_MESSAGE); } -- cgit v1.2.3