From 03444c3146a0d1c29ffce7ba1aa90a816c3b9610 Mon Sep 17 00:00:00 2001 From: bancika Date: Sat, 15 Jan 2011 20:32:46 +0000 Subject: [PATCH] added helper methods for config reader --- .../DIYLC/DIYLCStarter.launch | 15 +++++++++++++++ .../DIYLC/lib/bancika-gui-framework.jar | Bin 86611 -> 86924 bytes .../src/org/diylc/gui/DialogFactory.java | 4 ++-- .../diylc/plugins/canvas/CanvasPlugin.java | 7 ++----- .../diylc/plugins/statusbar/StatusBar.java | 9 +++------ .../src/org/diylc/presenter/Presenter.java | 18 +++++++----------- 6 files changed, 29 insertions(+), 24 deletions(-) create mode 100644 diy-layout-creator --username bancika@gmail.com/DIYLC/DIYLCStarter.launch diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/DIYLCStarter.launch b/ diy-layout-creator --username bancika@gmail.com/DIYLC/DIYLCStarter.launch new file mode 100644 index 00000000..fe5ea2b6 --- /dev/null +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/DIYLCStarter.launch @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/lib/bancika-gui-framework.jar b/ diy-layout-creator --username bancika@gmail.com/DIYLC/lib/bancika-gui-framework.jar index 9db91a930891da6670f29f1d024a5def1fcd2bd4..829a22054a3983af72935120c47d79811226ae54 100644 GIT binary patch delta 4132 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 delta 3856 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 diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/DialogFactory.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/DialogFactory.java index 792b0584..5e976fef 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/DialogFactory.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/DialogFactory.java @@ -50,7 +50,7 @@ public class DialogFactory { public void initialize(JFrame mainFrame) { this.mainFrame = mainFrame; String lastDirectoryPath = (String) ConfigurationManager.getInstance() - .getConfigurationItem(PATH_KEY); + .readString(PATH_KEY, null); if (lastDirectoryPath != null) { lastDirectory = new File(lastDirectoryPath); } @@ -111,7 +111,7 @@ public class DialogFactory { fileChooser.setAccessory(null); if (result == JFileChooser.APPROVE_OPTION) { lastDirectory = fileChooser.getCurrentDirectory(); - ConfigurationManager.getInstance().setConfigurationItem(PATH_KEY, + ConfigurationManager.getInstance().writeValue(PATH_KEY, lastDirectory.getAbsolutePath()); if (fileChooser.getSelectedFile().getAbsolutePath().contains(".")) { return fileChooser.getSelectedFile(); diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/CanvasPlugin.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/CanvasPlugin.java index b53f7456..6fed7946 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/CanvasPlugin.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/CanvasPlugin.java @@ -48,11 +48,8 @@ public class CanvasPlugin implements IPlugIn { scrollPane = new RulerScrollPane(canvasPanel, new ProjectDrawingProvider(plugInPort), new Size(1d, SizeUnit.cm).convertToPixels(), new Size(1d, SizeUnit.in) .convertToPixels()); - Boolean metric = (Boolean) ConfigurationManager.getInstance().getConfigurationItem( - Presenter.METRIC_KEY); - if (metric == null) { - metric = true; - } + boolean metric = ConfigurationManager.getInstance().readBoolean( + Presenter.METRIC_KEY, true); scrollPane.setMetric(metric); scrollPane.addUnitListener(new IRulerListener() { diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/statusbar/StatusBar.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/statusbar/StatusBar.java index 6397846d..ea8c9ba1 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/statusbar/StatusBar.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/statusbar/StatusBar.java @@ -207,17 +207,14 @@ public class StatusBar extends JPanel implements IPlugIn { break; case SELECTION_SIZE_CHANGED: Point2D size = (Point2D) params[0]; - Boolean isMetric = (Boolean) ConfigurationManager.getInstance().getConfigurationItem( - Presenter.METRIC_KEY); - if (isMetric == null) { - isMetric = true; - } + boolean metric = ConfigurationManager.getInstance().readBoolean( + Presenter.METRIC_KEY, true); if (size == null) { getSizeLabel().setText("N/A"); } else { getSizeLabel().setText( sizeFormat.format(size.getX()) + " x " + sizeFormat.format(size.getY()) - + (isMetric ? " cm" : " in")); + + (metric ? " cm" : " in")); } break; case SLOT_CHANGED: diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java index 6f139d21..18180539 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java @@ -836,7 +836,7 @@ public class Presenter implements IPlugInPort { for (IDIYComponent component : selectedComponents) { String className = component.getClass().getName(); LOG.debug("Default property value set for " + className + ":" + propertyName); - ConfigurationManager.getInstance().setConfigurationItem( + ConfigurationManager.getInstance().writeValue( DEFAULTS_KEY + className + ":" + propertyName, value); } } @@ -845,13 +845,13 @@ public class Presenter implements IPlugInPort { public void setProjectDefaultPropertyValue(String propertyName, Object value) { LOG.info(String.format("setProjectDefaultPropertyValue(%s, %s)", propertyName, value)); LOG.debug("Default property value set for " + Project.class.getName() + ":" + propertyName); - ConfigurationManager.getInstance().setConfigurationItem( + ConfigurationManager.getInstance().writeValue( DEFAULTS_KEY + Project.class.getName() + ":" + propertyName, value); } @Override public void setMetric(boolean isMetric) { - ConfigurationManager.getInstance().setConfigurationItem(Presenter.METRIC_KEY, isMetric); + ConfigurationManager.getInstance().writeValue(Presenter.METRIC_KEY, isMetric); messageDispatcher.dispatchMessage(EventType.SELECTION_SIZE_CHANGED, calculateSelectionDimension()); } @@ -957,11 +957,7 @@ public class Presenter implements IPlugInPort { if (selectedComponents.isEmpty()) { return null; } - Boolean isMetric = (Boolean) ConfigurationManager.getInstance().getConfigurationItem( - METRIC_KEY); - if (isMetric == null) { - isMetric = true; - } + boolean metric = ConfigurationManager.getInstance().readBoolean(METRIC_KEY, true); Area area = new Area(); for (IDIYComponent component : selectedComponents) { Area componentArea = componentAreaMap.get(component); @@ -973,7 +969,7 @@ public class Presenter implements IPlugInPort { double height = area.getBounds2D().getHeight(); width /= Constants.PIXELS_PER_INCH; height /= Constants.PIXELS_PER_INCH; - if (isMetric) { + if (metric) { width *= SizeUnit.in.getFactor() / SizeUnit.cm.getFactor(); height *= SizeUnit.in.getFactor() / SizeUnit.cm.getFactor(); } @@ -1082,8 +1078,8 @@ public class Presenter implements IPlugInPort { object.getClass()); // Override with default values if available. for (PropertyWrapper property : properties) { - Object defaultValue = ConfigurationManager.getInstance().getConfigurationItem( - DEFAULTS_KEY + object.getClass().getName() + ":" + property.getName()); + Object defaultValue = ConfigurationManager.getInstance().readObject( + DEFAULTS_KEY + object.getClass().getName() + ":" + property.getName(), null); if (defaultValue != null) { property.setValue(cloner.deepClone(defaultValue)); property.writeTo(object);