diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml b/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml index 6b58cd31..da85f687 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml @@ -1,27 +1,8 @@ - default.org.diylc.components.passive.Resistor:Value - - 100.0 - K - - - - metric - true - - - lastPath - C:\Documents and Settings\Branislav Stojkovic\Desktop - - - default.org.diylc.components.semiconductors.DIL_IC:Value - LM366 - - - default.org.diylc.components.passive.AxialFilmCapacitor:Width + default.org.diylc.core.Project:Grid spacing - 0.7 + 0.2 in diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/IPlugInPort.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/IPlugInPort.java index 29f4bae4..e82c7e13 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/IPlugInPort.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/IPlugInPort.java @@ -289,7 +289,17 @@ public interface IPlugInPort { * @param value * new default value, must not be null */ - void setDefaultPropertyValue(String propertyName, Object value); + void setSelectionDefaultPropertyValue(String propertyName, Object value); + + /** + * Sets default value for the specified property name for projects. + * + * @param propertyName + * display name for property + * @param value + * new default value, must not be null + */ + void setProjectDefaultPropertyValue(String propertyName, Object value); /** * @return a list of properties that are mutual for all the selected diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/CanvasPanel.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/CanvasPanel.java index 991c6f41..17812dcd 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/CanvasPanel.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/CanvasPanel.java @@ -198,7 +198,7 @@ class CanvasPanel extends JComponent implements Autoscroll { // Save default values. for (PropertyWrapper property : editor.getDefaultedProperties()) { if (property.getValue() != null) { - plugInPort.setDefaultPropertyValue(property.getName(), + plugInPort.setProjectDefaultPropertyValue(property.getName(), property.getValue()); } } @@ -217,7 +217,7 @@ class CanvasPanel extends JComponent implements Autoscroll { // Save default values. for (PropertyWrapper property : editor.getDefaultedProperties()) { if (property.getValue() != null) { - plugInPort.setDefaultPropertyValue(property.getName(), + plugInPort.setSelectionDefaultPropertyValue(property.getName(), property.getValue()); } } diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/clipboard/ClipboardManager.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/clipboard/ClipboardManager.java index a63b9e59..5fba8db6 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/clipboard/ClipboardManager.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/clipboard/ClipboardManager.java @@ -264,7 +264,7 @@ public class ClipboardManager implements IPlugIn, ClipboardOwner { // Save default values. for (PropertyWrapper property : editor.getDefaultedProperties()) { if (property.getValue() != null) { - plugInPort.setDefaultPropertyValue(property.getName(), property.getValue()); + plugInPort.setProjectDefaultPropertyValue(property.getName(), property.getValue()); } } } @@ -299,7 +299,7 @@ public class ClipboardManager implements IPlugIn, ClipboardOwner { // Save default values. for (PropertyWrapper property : editor.getDefaultedProperties()) { if (property.getValue() != null) { - plugInPort.setDefaultPropertyValue(property.getName(), property.getValue()); + plugInPort.setSelectionDefaultPropertyValue(property.getName(), property.getValue()); } } } 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 301b3742..35b5a12c 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 @@ -829,8 +829,8 @@ public class Presenter implements IPlugInPort { @SuppressWarnings("unchecked") @Override - public void setDefaultPropertyValue(String propertyName, Object value) { - LOG.info(String.format("setDefaultPropertyValue(%s, %s)", propertyName, value)); + public void setSelectionDefaultPropertyValue(String propertyName, Object value) { + LOG.info(String.format("setSelectionDefaultPropertyValue(%s, %s)", propertyName, value)); for (IDIYComponent component : selectedComponents) { String className = component.getClass().getName(); LOG.debug("Default property value set for " + className + ":" + propertyName); @@ -839,6 +839,14 @@ public class Presenter implements IPlugInPort { } } + @Override + 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( + DEFAULTS_KEY + Project.class.getName() + ":" + propertyName, value); + } + @Override public void setMetric(boolean isMetric) { ConfigurationManager.getInstance().setConfigurationItem(Presenter.METRIC_KEY, isMetric); @@ -1104,7 +1112,8 @@ public class Presenter implements IPlugInPort { } } catch (Exception e) { LOG.error("Could not apply selection properties", e); - view.showMessage("Could not apply changes to the selection. Check the log for details.", + view.showMessage( + "Could not apply changes to the selection. Check the log for details.", "Error", JOptionPane.ERROR_MESSAGE); } finally { // Notify the listeners.