diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/AbstractLeadedComponentInstance.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/AbstractLeadedComponentInstance.java index 46907c5c..ff4490f3 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/AbstractLeadedComponentInstance.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/AbstractLeadedComponentInstance.java @@ -2,12 +2,12 @@ package org.diylc.components; import java.awt.Point; -import org.diylc.model.IComponentInstance; -import org.diylc.model.VisibilityPolicy; -import org.diylc.model.annotations.BomName; -import org.diylc.model.annotations.ControlPoint; -import org.diylc.model.annotations.EditableProperty; -import org.diylc.model.measures.Size; +import org.diylc.core.IComponentInstance; +import org.diylc.core.VisibilityPolicy; +import org.diylc.core.annotations.BomName; +import org.diylc.core.annotations.ControlPoint; +import org.diylc.core.annotations.EditableProperty; +import org.diylc.core.measures.Size; import org.diylc.utils.Constants; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/MockComponentInstance.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/MockComponentInstance.java index d626efa6..c18b8dd0 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/MockComponentInstance.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/MockComponentInstance.java @@ -4,19 +4,19 @@ import java.awt.Color; import java.awt.Graphics2D; import java.awt.Point; -import org.diylc.model.ComponentState; -import org.diylc.model.IComponentInstance; -import org.diylc.model.VisibilityPolicy; -import org.diylc.model.annotations.BomName; -import org.diylc.model.annotations.BomValue; -import org.diylc.model.annotations.ControlPoint; -import org.diylc.model.annotations.EditableProperty; -import org.diylc.model.measures.Capacitance; -import org.diylc.model.measures.CapacitanceUnit; -import org.diylc.model.measures.Resistance; -import org.diylc.model.measures.ResistanceUnit; -import org.diylc.model.measures.Size; -import org.diylc.model.measures.SizeUnit; +import org.diylc.core.ComponentState; +import org.diylc.core.IComponentInstance; +import org.diylc.core.VisibilityPolicy; +import org.diylc.core.annotations.BomName; +import org.diylc.core.annotations.BomValue; +import org.diylc.core.annotations.ControlPoint; +import org.diylc.core.annotations.EditableProperty; +import org.diylc.core.measures.Capacitance; +import org.diylc.core.measures.CapacitanceUnit; +import org.diylc.core.measures.Resistance; +import org.diylc.core.measures.ResistanceUnit; +import org.diylc.core.measures.Size; +import org.diylc.core.measures.SizeUnit; public class MockComponentInstance implements IComponentInstance { diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/MockComponentType.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/MockComponentType.java index 688feb0d..889fcb0e 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/MockComponentType.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/MockComponentType.java @@ -2,10 +2,10 @@ package org.diylc.components; import javax.swing.Icon; +import org.diylc.core.ComponentLayer; +import org.diylc.core.IComponentInstance; +import org.diylc.core.IComponentType; import org.diylc.images.IconLoader; -import org.diylc.model.ComponentLayer; -import org.diylc.model.IComponentInstance; -import org.diylc.model.IComponentType; public class MockComponentType implements IComponentType { diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/ResistorInstance.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/ResistorInstance.java index 0aaa3fac..e5eecfc9 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/ResistorInstance.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/ResistorInstance.java @@ -4,12 +4,12 @@ import java.awt.BasicStroke; import java.awt.Color; import java.awt.Graphics2D; -import org.diylc.model.ComponentState; -import org.diylc.model.annotations.EditableProperty; -import org.diylc.model.measures.Resistance; -import org.diylc.model.measures.ResistanceUnit; -import org.diylc.model.measures.Size; -import org.diylc.model.measures.SizeUnit; +import org.diylc.core.ComponentState; +import org.diylc.core.annotations.EditableProperty; +import org.diylc.core.measures.Resistance; +import org.diylc.core.measures.ResistanceUnit; +import org.diylc.core.measures.Size; +import org.diylc.core.measures.SizeUnit; public class ResistorInstance extends AbstractLeadedComponentInstance { diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/ResistorType.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/ResistorType.java index 356ca081..952676cc 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/ResistorType.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/ResistorType.java @@ -2,10 +2,10 @@ package org.diylc.components; import javax.swing.Icon; +import org.diylc.core.ComponentLayer; +import org.diylc.core.IComponentInstance; +import org.diylc.core.IComponentType; import org.diylc.images.IconLoader; -import org.diylc.model.ComponentLayer; -import org.diylc.model.IComponentInstance; -import org.diylc.model.IComponentType; public class ResistorType implements IComponentType { diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/ComponentSelection.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/ComponentSelection.java index fb821120..f930adf4 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/ComponentSelection.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/ComponentSelection.java @@ -8,7 +8,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.diylc.model.IComponentInstance; +import org.diylc.core.IComponentInstance; /** diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/ControlPointWrapper.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/ControlPointWrapper.java index 4a0df644..99c8a99c 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/ControlPointWrapper.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/ControlPointWrapper.java @@ -4,8 +4,8 @@ import java.awt.Point; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.diylc.model.IComponentInstance; -import org.diylc.model.VisibilityPolicy; +import org.diylc.core.IComponentInstance; +import org.diylc.core.VisibilityPolicy; /** diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/EventType.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/EventType.java index b07830b3..093d0a66 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/EventType.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/EventType.java @@ -2,8 +2,8 @@ package org.diylc.common; import java.awt.Rectangle; -import org.diylc.model.IComponentType; -import org.diylc.model.Project; +import org.diylc.core.IComponentType; +import org.diylc.core.Project; /** 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 d26bccd3..18c219a3 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 @@ -14,10 +14,10 @@ import javax.swing.JComponent; import javax.swing.SwingConstants; import javax.swing.JPopupMenu.Separator; -import org.diylc.model.ComponentLayer; -import org.diylc.model.IComponentInstance; -import org.diylc.model.IComponentType; -import org.diylc.model.Project; +import org.diylc.core.ComponentLayer; +import org.diylc.core.IComponentInstance; +import org.diylc.core.IComponentType; +import org.diylc.core.Project; import com.diyfever.gui.simplemq.IMessageListener; import com.diyfever.gui.simplemq.MessageDispatcher; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/PropertyWrapper.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/PropertyWrapper.java index 82d1f2ad..ad831092 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/PropertyWrapper.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/PropertyWrapper.java @@ -3,7 +3,7 @@ package org.diylc.common; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.diylc.model.IComponentInstance; +import org.diylc.core.IComponentInstance; /** diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/ComponentLayer.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/ComponentLayer.java similarity index 85% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/ComponentLayer.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/ComponentLayer.java index 3f04d33c..9ba83380 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/ComponentLayer.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/ComponentLayer.java @@ -1,4 +1,4 @@ -package org.diylc.model; +package org.diylc.core; /** * Enumerates all drawing layers. diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/ComponentState.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/ComponentState.java similarity index 82% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/ComponentState.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/ComponentState.java index e0a85480..ec33071b 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/ComponentState.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/ComponentState.java @@ -1,4 +1,4 @@ -package org.diylc.model; +package org.diylc.core; /** * Enumerates all possible states that a component can be in. diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/IComponentInstance.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/IComponentInstance.java similarity index 92% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/IComponentInstance.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/IComponentInstance.java index 4a09493d..0dc8438e 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/IComponentInstance.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/IComponentInstance.java @@ -1,4 +1,4 @@ -package org.diylc.model; +package org.diylc.core; import java.awt.Graphics2D; import java.io.Serializable; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/IComponentType.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/IComponentType.java similarity index 92% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/IComponentType.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/IComponentType.java index 8e6ee886..bfb173d9 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/IComponentType.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/IComponentType.java @@ -1,4 +1,4 @@ -package org.diylc.model; +package org.diylc.core; import javax.swing.Icon; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/Project.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/Project.java similarity index 92% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/Project.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/Project.java index a8acd27e..da4ccf46 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/Project.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/Project.java @@ -1,12 +1,12 @@ -package org.diylc.model; +package org.diylc.core; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.diylc.model.annotations.EditableProperty; -import org.diylc.model.measures.Size; -import org.diylc.model.measures.SizeUnit; +import org.diylc.core.annotations.EditableProperty; +import org.diylc.core.measures.Size; +import org.diylc.core.measures.SizeUnit; /** diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/VisibilityPolicy.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/VisibilityPolicy.java similarity index 89% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/VisibilityPolicy.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/VisibilityPolicy.java index c08d8f63..040d8730 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/VisibilityPolicy.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/VisibilityPolicy.java @@ -1,4 +1,4 @@ -package org.diylc.model; +package org.diylc.core; /** * Enumerates control point visibility policies. diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/annotations/BomName.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/annotations/BomName.java similarity index 86% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/annotations/BomName.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/annotations/BomName.java index 9115f3dc..866bcf21 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/annotations/BomName.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/annotations/BomName.java @@ -1,4 +1,4 @@ -package org.diylc.model.annotations; +package org.diylc.core.annotations; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/annotations/BomValue.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/annotations/BomValue.java similarity index 86% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/annotations/BomValue.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/annotations/BomValue.java index 922d1066..5ebe79f3 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/annotations/BomValue.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/annotations/BomValue.java @@ -1,4 +1,4 @@ -package org.diylc.model.annotations; +package org.diylc.core.annotations; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/annotations/ComponentName.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/annotations/ComponentName.java similarity index 77% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/annotations/ComponentName.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/annotations/ComponentName.java index 4515e794..6855e18c 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/annotations/ComponentName.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/annotations/ComponentName.java @@ -1,4 +1,4 @@ -package org.diylc.model.annotations; +package org.diylc.core.annotations; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/annotations/ControlPoint.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/annotations/ControlPoint.java similarity index 89% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/annotations/ControlPoint.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/annotations/ControlPoint.java index 6ac4a790..c734a491 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/annotations/ControlPoint.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/annotations/ControlPoint.java @@ -1,10 +1,10 @@ -package org.diylc.model.annotations; +package org.diylc.core.annotations; import java.awt.Point; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import org.diylc.model.VisibilityPolicy; +import org.diylc.core.VisibilityPolicy; /** diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/annotations/EditableProperty.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/annotations/EditableProperty.java similarity index 92% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/annotations/EditableProperty.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/annotations/EditableProperty.java index 3b539dcc..a01a3f2b 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/annotations/EditableProperty.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/annotations/EditableProperty.java @@ -1,4 +1,4 @@ -package org.diylc.model.annotations; +package org.diylc.core.annotations; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/AbstractMeasure.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/AbstractMeasure.java similarity index 93% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/AbstractMeasure.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/AbstractMeasure.java index 90b193e4..875cc51e 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/AbstractMeasure.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/AbstractMeasure.java @@ -1,4 +1,4 @@ -package org.diylc.model.measures; +package org.diylc.core.measures; import java.io.Serializable; import java.text.DecimalFormat; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/Capacitance.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/Capacitance.java similarity index 89% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/Capacitance.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/Capacitance.java index cdc4bba7..6c1a12ac 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/Capacitance.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/Capacitance.java @@ -1,4 +1,4 @@ -package org.diylc.model.measures; +package org.diylc.core.measures; public class Capacitance extends AbstractMeasure { diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/CapacitanceUnit.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/CapacitanceUnit.java similarity index 87% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/CapacitanceUnit.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/CapacitanceUnit.java index a15d129c..5b26a057 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/CapacitanceUnit.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/CapacitanceUnit.java @@ -1,4 +1,4 @@ -package org.diylc.model.measures; +package org.diylc.core.measures; public enum CapacitanceUnit implements Unit { diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/Converter.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/Converter.java similarity index 79% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/Converter.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/Converter.java index 7304fbbd..9e35d586 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/Converter.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/Converter.java @@ -1,4 +1,4 @@ -package org.diylc.model.measures; +package org.diylc.core.measures; public class Converter { diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/Inductance.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/Inductance.java similarity index 88% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/Inductance.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/Inductance.java index 3752d173..a805feab 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/Inductance.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/Inductance.java @@ -1,4 +1,4 @@ -package org.diylc.model.measures; +package org.diylc.core.measures; public class Inductance extends AbstractMeasure { diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/InductanceUnit.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/InductanceUnit.java similarity index 87% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/InductanceUnit.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/InductanceUnit.java index a2e28149..e00facd8 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/InductanceUnit.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/InductanceUnit.java @@ -1,4 +1,4 @@ -package org.diylc.model.measures; +package org.diylc.core.measures; public enum InductanceUnit implements Unit { diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/Resistance.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/Resistance.java similarity index 89% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/Resistance.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/Resistance.java index 9e3a7d18..89161c7f 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/Resistance.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/Resistance.java @@ -1,4 +1,4 @@ -package org.diylc.model.measures; +package org.diylc.core.measures; public class Resistance extends AbstractMeasure { diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/ResistanceUnit.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/ResistanceUnit.java similarity index 86% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/ResistanceUnit.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/ResistanceUnit.java index c4bb47bf..9d7a917f 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/ResistanceUnit.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/ResistanceUnit.java @@ -1,4 +1,4 @@ -package org.diylc.model.measures; +package org.diylc.core.measures; public enum ResistanceUnit implements Unit { diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/Size.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/Size.java similarity index 91% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/Size.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/Size.java index add742bd..4dd220de 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/Size.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/Size.java @@ -1,4 +1,4 @@ -package org.diylc.model.measures; +package org.diylc.core.measures; import java.awt.Toolkit; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/SizeUnit.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/SizeUnit.java similarity index 83% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/SizeUnit.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/SizeUnit.java index 149a75d7..fe8afd35 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/SizeUnit.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/SizeUnit.java @@ -1,4 +1,4 @@ -package org.diylc.model.measures; +package org.diylc.core.measures; public enum SizeUnit implements Unit { diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/Unit.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/Unit.java similarity index 55% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/Unit.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/Unit.java index b23b7847..90413341 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/model/measures/Unit.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/Unit.java @@ -1,4 +1,4 @@ -package org.diylc.model.measures; +package org.diylc.core.measures; public interface Unit { diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/MainFrame.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/MainFrame.java index f6e54ec5..842f4e2c 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/MainFrame.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/MainFrame.java @@ -22,7 +22,7 @@ import javax.swing.SwingConstants; import javax.swing.Timer; import org.diylc.common.BadPositionException; -import org.diylc.model.Project; +import org.diylc.core.Project; import org.diylc.plugins.canvas.CanvasPlugin; import org.diylc.plugins.clipboard.ClipboardManager; import org.diylc.plugins.file.FileManager; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/FieldEditorFactory.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/FieldEditorFactory.java index 6df15120..7ba92c39 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/FieldEditorFactory.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/FieldEditorFactory.java @@ -4,7 +4,7 @@ import java.awt.Color; import java.awt.Component; import org.diylc.common.PropertyWrapper; -import org.diylc.model.measures.AbstractMeasure; +import org.diylc.core.measures.AbstractMeasure; public class FieldEditorFactory { diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/MeasureEditor.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/MeasureEditor.java index 80423ef6..c37c261f 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/MeasureEditor.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/MeasureEditor.java @@ -12,7 +12,7 @@ import java.lang.reflect.Method; import javax.swing.JComboBox; import org.diylc.common.PropertyWrapper; -import org.diylc.model.measures.AbstractMeasure; +import org.diylc.core.measures.AbstractMeasure; import com.diyfever.gui.DoubleTextField; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/SelectionTransferable.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/SelectionTransferable.java index 07545701..5bdbc7af 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/SelectionTransferable.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/SelectionTransferable.java @@ -7,7 +7,7 @@ import java.awt.datatransfer.UnsupportedFlavorException; import java.io.IOException; import java.util.List; -import org.diylc.model.IComponentInstance; +import org.diylc.core.IComponentInstance; public class SelectionTransferable implements Transferable { 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 eaaa3bbb..fd90ed9f 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 @@ -19,9 +19,9 @@ import org.diylc.common.ComponentSelection; import org.diylc.common.EventType; import org.diylc.common.IPlugIn; import org.diylc.common.IPlugInPort; +import org.diylc.core.IComponentInstance; +import org.diylc.core.Project; import org.diylc.images.IconLoader; -import org.diylc.model.IComponentInstance; -import org.diylc.model.Project; import com.diyfever.gui.undo.IUndoListener; import com.diyfever.gui.undo.UndoHandler; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/BomMaker.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/BomMaker.java index b6014e3b..0f1d08f2 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/BomMaker.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/BomMaker.java @@ -7,7 +7,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.diylc.model.IComponentInstance; +import org.diylc.core.IComponentInstance; import org.diylc.presenter.ComponentProcessor; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/FileManager.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/FileManager.java index 3a15cee1..7774f638 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/FileManager.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/FileManager.java @@ -15,9 +15,9 @@ import org.apache.log4j.Logger; import org.diylc.common.EventType; import org.diylc.common.IPlugIn; import org.diylc.common.IPlugInPort; +import org.diylc.core.Project; import org.diylc.gui.DialogFactory; import org.diylc.images.IconLoader; -import org.diylc.model.Project; import com.diyfever.gui.export.DrawingExporter; import com.thoughtworks.xstream.XStream; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/ProjectPreview.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/ProjectPreview.java index 797bb970..16f68193 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/ProjectPreview.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/ProjectPreview.java @@ -21,8 +21,8 @@ import javax.swing.JPanel; import org.diylc.common.BadPositionException; import org.diylc.common.DrawOption; import org.diylc.common.IPlugInPort; +import org.diylc.core.Project; import org.diylc.gui.IView; -import org.diylc.model.Project; import org.diylc.presenter.Presenter; import com.diyfever.gui.IFileChooserAccessory; 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 760fe68e..6e7d7300 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 @@ -21,8 +21,8 @@ import org.diylc.common.ControlPointWrapper; import org.diylc.common.EventType; import org.diylc.common.IPlugIn; import org.diylc.common.IPlugInPort; -import org.diylc.model.IComponentInstance; -import org.diylc.model.IComponentType; +import org.diylc.core.IComponentInstance; +import org.diylc.core.IComponentType; import org.diylc.presenter.ComponentProcessor; import com.diyfever.gui.MemoryBar; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/toolbox/ComponentButton.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/toolbox/ComponentButton.java index e860e9ff..3240f744 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/toolbox/ComponentButton.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/toolbox/ComponentButton.java @@ -8,7 +8,7 @@ import java.awt.event.ActionListener; import javax.swing.JButton; import org.diylc.common.IPlugInPort; -import org.diylc.model.IComponentType; +import org.diylc.core.IComponentType; /** diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/toolbox/ComponentTabbedPane.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/toolbox/ComponentTabbedPane.java index 7ea388f7..f1c6a1e5 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/toolbox/ComponentTabbedPane.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/toolbox/ComponentTabbedPane.java @@ -9,7 +9,7 @@ import javax.swing.JButton; import javax.swing.JTabbedPane; import org.diylc.common.IPlugInPort; -import org.diylc.model.IComponentType; +import org.diylc.core.IComponentType; class ComponentTabbedPane extends JTabbedPane { diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/ComponentProcessor.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/ComponentProcessor.java index bcf45f85..5250744a 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/ComponentProcessor.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/ComponentProcessor.java @@ -10,11 +10,11 @@ import java.util.Map; import org.apache.log4j.Logger; import org.diylc.common.ControlPointWrapper; import org.diylc.common.PropertyWrapper; -import org.diylc.model.IComponentInstance; -import org.diylc.model.annotations.BomName; -import org.diylc.model.annotations.BomValue; -import org.diylc.model.annotations.ControlPoint; -import org.diylc.model.annotations.EditableProperty; +import org.diylc.core.IComponentInstance; +import org.diylc.core.annotations.BomName; +import org.diylc.core.annotations.BomValue; +import org.diylc.core.annotations.ControlPoint; +import org.diylc.core.annotations.EditableProperty; import com.rits.cloning.Cloner; 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 c65d12d7..34401084 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 @@ -33,13 +33,13 @@ import org.diylc.common.EventType; import org.diylc.common.IPlugIn; import org.diylc.common.IPlugInPort; import org.diylc.common.PropertyWrapper; +import org.diylc.core.ComponentLayer; +import org.diylc.core.ComponentState; +import org.diylc.core.IComponentInstance; +import org.diylc.core.IComponentType; +import org.diylc.core.Project; +import org.diylc.core.VisibilityPolicy; import org.diylc.gui.IView; -import org.diylc.model.ComponentLayer; -import org.diylc.model.ComponentState; -import org.diylc.model.IComponentInstance; -import org.diylc.model.IComponentType; -import org.diylc.model.Project; -import org.diylc.model.VisibilityPolicy; import org.diylc.utils.Constants; import com.diyfever.gui.miscutils.ConfigurationManager; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/test/org/diylc/plugins/file/BomMakerTest.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/test/org/diylc/plugins/file/BomMakerTest.java index d6c8ff17..2a1b90be 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/test/org/diylc/plugins/file/BomMakerTest.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/test/org/diylc/plugins/file/BomMakerTest.java @@ -6,9 +6,9 @@ import java.util.ArrayList; import java.util.List; import org.diylc.components.MockComponentInstance; -import org.diylc.model.IComponentInstance; -import org.diylc.model.measures.Capacitance; -import org.diylc.model.measures.CapacitanceUnit; +import org.diylc.core.IComponentInstance; +import org.diylc.core.measures.Capacitance; +import org.diylc.core.measures.CapacitanceUnit; import org.diylc.plugins.file.BomEntry; import org.diylc.plugins.file.BomMaker; import org.junit.Test;