diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/lib/app-framework.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-core/lib/app-framework.jar index da3fb559..604c5faa 100644 Binary files a/ diy-layout-creator --username bancika@gmail.com/diylc-core/lib/app-framework.jar and b/ diy-layout-creator --username bancika@gmail.com/diylc-core/lib/app-framework.jar differ diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar index 1d01f378..90d9cd1c 100644 Binary files a/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar and b/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar differ diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/IPlugIn.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/IPlugIn.java index 3764fc44..cbfee46a 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/IPlugIn.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/IPlugIn.java @@ -1,6 +1,6 @@ package org.diylc.common; -import com.diyfever.gui.simplemq.IMessageListener; +import org.diylc.appframework.simplemq.IMessageListener; /** * Interface for plug-ins. diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/IPlugInPort.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/IPlugInPort.java index 3730c9e0..cf962148 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/IPlugInPort.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/IPlugInPort.java @@ -9,14 +9,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.diylc.appframework.simplemq.IMessageListener; +import org.diylc.appframework.simplemq.MessageDispatcher; +import org.diylc.appframework.update.VersionNumber; import org.diylc.core.IDIYComponent; import org.diylc.core.Project; import org.diylc.core.Theme; -import com.diyfever.gui.simplemq.IMessageListener; -import com.diyfever.gui.simplemq.MessageDispatcher; -import com.diyfever.gui.update.VersionNumber; - /** * Interface for communication between plug-ins and the application. Plug-ins * may acquire information or make changes through this interface. Application diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/components/AbstractLeadedComponent.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/components/AbstractLeadedComponent.java index c58a5cfc..86e605b0 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/components/AbstractLeadedComponent.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/components/AbstractLeadedComponent.java @@ -12,6 +12,7 @@ import java.awt.geom.AffineTransform; import java.awt.geom.Ellipse2D; import java.awt.geom.Rectangle2D; +import org.diylc.appframework.miscutils.ConfigurationManager; import org.diylc.common.Display; import org.diylc.common.IPlugInPort; import org.diylc.common.ObjectCache; @@ -25,8 +26,6 @@ import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; import org.diylc.utils.Constants; -import com.diyfever.gui.miscutils.ConfigurationManager; - /** * Base class for all leaded components such as resistors or capacitors. Has two * control points and draws leads between them. Also, it positions and draws the diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/core/Project.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/core/Project.java index a4c3bd9f..94e09481 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/core/Project.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/core/Project.java @@ -6,13 +6,12 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.diylc.appframework.update.VersionNumber; import org.diylc.core.annotations.EditableProperty; import org.diylc.core.annotations.PositiveMeasureValidator; import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; -import com.diyfever.gui.update.VersionNumber; - /** * Entity class that defines a project. Contains project properties and a * collection of components.This class is serialized to file. Some filed getters diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/DrawingManager.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/DrawingManager.java index 778208de..5a347c30 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/DrawingManager.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/DrawingManager.java @@ -17,6 +17,8 @@ import java.util.Map; import java.util.Set; import org.apache.log4j.Logger; +import org.diylc.appframework.miscutils.ConfigurationManager; +import org.diylc.appframework.simplemq.MessageDispatcher; import org.diylc.common.DrawOption; import org.diylc.common.EventType; import org.diylc.common.GridType; @@ -30,9 +32,6 @@ import org.diylc.core.Theme; import org.diylc.core.VisibilityPolicy; import org.diylc.utils.Constants; -import com.diyfever.gui.miscutils.ConfigurationManager; -import com.diyfever.gui.simplemq.MessageDispatcher; - /** * Utility that deals with painting {@link Project} on the {@link Graphics2D} * and keeps areas taken by each drawn component. diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/InstantiationManager.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/InstantiationManager.java index e2176333..d99a5052 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/InstantiationManager.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/InstantiationManager.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.log4j.Logger; +import org.diylc.appframework.miscutils.ConfigurationManager; import org.diylc.common.ComponentType; import org.diylc.common.IPlugInPort; import org.diylc.common.PropertyWrapper; @@ -13,7 +14,6 @@ import org.diylc.core.IDIYComponent; import org.diylc.core.Project; import org.diylc.core.measures.Size; -import com.diyfever.gui.miscutils.ConfigurationManager; import com.rits.cloning.Cloner; /** diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java index 714484fd..dba71d3c 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java @@ -23,6 +23,11 @@ import java.util.Set; import javax.swing.JOptionPane; import org.apache.log4j.Logger; +import org.diylc.appframework.miscutils.ConfigurationManager; +import org.diylc.appframework.miscutils.JarScanner; +import org.diylc.appframework.miscutils.Utils; +import org.diylc.appframework.simplemq.MessageDispatcher; +import org.diylc.appframework.update.VersionNumber; import org.diylc.common.ComponentType; import org.diylc.common.DrawOption; import org.diylc.common.EventType; @@ -38,11 +43,6 @@ import org.diylc.core.Theme; import org.diylc.core.measures.SizeUnit; import org.diylc.utils.Constants; -import com.diyfever.gui.miscutils.ConfigurationManager; -import com.diyfever.gui.miscutils.JarScanner; -import com.diyfever.gui.miscutils.Utils; -import com.diyfever.gui.simplemq.MessageDispatcher; -import com.diyfever.gui.update.VersionNumber; import com.rits.cloning.Cloner; /** diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/ProjectFileManager.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/ProjectFileManager.java index bf55eb83..b846ce58 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/ProjectFileManager.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/ProjectFileManager.java @@ -16,6 +16,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.apache.log4j.Logger; +import org.diylc.appframework.simplemq.MessageDispatcher; import org.diylc.common.EventType; import org.diylc.common.Orientation; import org.diylc.components.boards.AbstractBoard; @@ -47,7 +48,6 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; -import com.diyfever.gui.simplemq.MessageDispatcher; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.io.xml.DomDriver; diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/test/org/diylc/components/MockDIYComponent.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/test/org/diylc/components/MockDIYComponent.java index 7752c5bd..110c5848 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/test/org/diylc/components/MockDIYComponent.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/test/org/diylc/components/MockDIYComponent.java @@ -8,7 +8,6 @@ import org.diylc.core.ComponentState; import org.diylc.core.IDIYComponent; import org.diylc.core.IDrawingObserver; import org.diylc.core.Project; -import org.diylc.core.Theme; import org.diylc.core.VisibilityPolicy; import org.diylc.core.annotations.ComponentDescriptor; import org.diylc.core.annotations.EditableProperty; diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/app-framework.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/app-framework.jar index da3fb559..604c5faa 100644 Binary files a/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/app-framework.jar and b/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/app-framework.jar differ diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/boards/AbstractBoard.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/boards/AbstractBoard.java index f645c5b5..9baadbfd 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/boards/AbstractBoard.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/boards/AbstractBoard.java @@ -6,20 +6,15 @@ import java.awt.Composite; import java.awt.Graphics2D; import java.awt.Point; -import org.diylc.common.IPlugInPort; import org.diylc.common.ObjectCache; import org.diylc.components.AbstractTransparentComponent; import org.diylc.core.ComponentState; import org.diylc.core.IDrawingObserver; import org.diylc.core.Project; -import org.diylc.core.Theme; import org.diylc.core.VisibilityPolicy; import org.diylc.core.annotations.EditableProperty; import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; -import org.diylc.utils.Constants; - -import com.diyfever.gui.miscutils.ConfigurationManager; public abstract class AbstractBoard extends AbstractTransparentComponent { diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/boards/EyeletBoard.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/boards/EyeletBoard.java index cf7185a0..b05bfa0a 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/boards/EyeletBoard.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/boards/EyeletBoard.java @@ -10,7 +10,6 @@ import org.diylc.core.ComponentState; import org.diylc.core.IDIYComponent; import org.diylc.core.IDrawingObserver; import org.diylc.core.Project; -import org.diylc.core.Theme; import org.diylc.core.annotations.ComponentDescriptor; import org.diylc.core.annotations.EditableProperty; import org.diylc.core.measures.Size; diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/boards/MarshallPerfBoard.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/boards/MarshallPerfBoard.java index fc67654a..72bafe61 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/boards/MarshallPerfBoard.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/boards/MarshallPerfBoard.java @@ -10,7 +10,6 @@ import org.diylc.core.ComponentState; import org.diylc.core.IDIYComponent; import org.diylc.core.IDrawingObserver; import org.diylc.core.Project; -import org.diylc.core.Theme; import org.diylc.core.annotations.ComponentDescriptor; import org.diylc.core.annotations.EditableProperty; import org.diylc.core.measures.Size; diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/boards/PerfBoard.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/boards/PerfBoard.java index 31321ea5..1fbd6dfd 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/boards/PerfBoard.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/boards/PerfBoard.java @@ -10,7 +10,6 @@ import org.diylc.core.ComponentState; import org.diylc.core.IDIYComponent; import org.diylc.core.IDrawingObserver; import org.diylc.core.Project; -import org.diylc.core.Theme; import org.diylc.core.annotations.ComponentDescriptor; import org.diylc.core.annotations.EditableProperty; import org.diylc.core.measures.Size; diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/connectivity/SolderPad.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/connectivity/SolderPad.java index 19492074..c80cd619 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/connectivity/SolderPad.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/connectivity/SolderPad.java @@ -9,7 +9,6 @@ import org.diylc.core.ComponentState; import org.diylc.core.IDIYComponent; import org.diylc.core.IDrawingObserver; import org.diylc.core.Project; -import org.diylc.core.Theme; import org.diylc.core.VisibilityPolicy; import org.diylc.core.annotations.ComponentDescriptor; import org.diylc.core.annotations.EditableProperty; diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java index 1010136e..a0be8427 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java @@ -8,6 +8,7 @@ import java.awt.Point; import java.awt.Shape; import java.awt.geom.RoundRectangle2D; +import org.diylc.appframework.miscutils.ConfigurationManager; import org.diylc.common.IPlugInPort; import org.diylc.common.ObjectCache; import org.diylc.components.AbstractTransparentComponent; @@ -23,8 +24,6 @@ import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; import org.diylc.utils.Constants; -import com.diyfever.gui.miscutils.ConfigurationManager; - @ComponentDescriptor(name = "Mini Toggle Switch", category = "Electromechanical", author = "Branislav Stojkovic", description = "Panel mounted mini toggle switch", stretchable = false, zOrder = IDIYComponent.COMPONENT, instanceNamePrefix = "SW") public class MiniToggleSwitch extends AbstractTransparentComponent { diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/AxialElectrolyticCapacitor.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/AxialElectrolyticCapacitor.java index 71472d91..e26b115a 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/AxialElectrolyticCapacitor.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/AxialElectrolyticCapacitor.java @@ -5,6 +5,7 @@ import java.awt.Graphics2D; import java.awt.Shape; import java.awt.geom.Rectangle2D; +import org.diylc.appframework.miscutils.ConfigurationManager; import org.diylc.common.IPlugInPort; import org.diylc.common.ObjectCache; import org.diylc.components.AbstractLeadedComponent; @@ -19,8 +20,6 @@ import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; import org.diylc.utils.Constants; -import com.diyfever.gui.miscutils.ConfigurationManager; - @ComponentDescriptor(name = "Electrolytic Capacitor (axial)", author = "Branislav Stojkovic", category = "Passive", creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "C", description = "Axial electrolytic capacitor, similar to Sprague Atom, F&T, etc", zOrder = IDIYComponent.COMPONENT) public class AxialElectrolyticCapacitor extends AbstractLeadedComponent { diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/CapacitorSymbol.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/CapacitorSymbol.java index a1a7f6ce..bb2ae5f9 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/CapacitorSymbol.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/CapacitorSymbol.java @@ -7,7 +7,6 @@ import java.awt.geom.GeneralPath; import org.diylc.components.AbstractSchematicLeadedSymbol; import org.diylc.core.CreationMethod; import org.diylc.core.IDIYComponent; -import org.diylc.core.Theme; import org.diylc.core.annotations.ComponentDescriptor; import org.diylc.core.annotations.EditableProperty; import org.diylc.core.measures.Capacitance; diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/PotentiometerPanel.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/PotentiometerPanel.java index cc84a5c2..1ee92aa8 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/PotentiometerPanel.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/PotentiometerPanel.java @@ -17,7 +17,6 @@ import org.diylc.core.CreationMethod; import org.diylc.core.IDIYComponent; import org.diylc.core.IDrawingObserver; import org.diylc.core.Project; -import org.diylc.core.Theme; import org.diylc.core.annotations.ComponentDescriptor; import org.diylc.core.annotations.EditableProperty; import org.diylc.core.measures.Size; diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/RadialElectrolytic.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/RadialElectrolytic.java index 901a587f..b4a894b2 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/RadialElectrolytic.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/RadialElectrolytic.java @@ -7,6 +7,7 @@ import java.awt.geom.Area; import java.awt.geom.Ellipse2D; import java.awt.geom.Rectangle2D; +import org.diylc.appframework.miscutils.ConfigurationManager; import org.diylc.common.IPlugInPort; import org.diylc.common.ObjectCache; import org.diylc.components.AbstractLeadedComponent; @@ -21,8 +22,6 @@ import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; import org.diylc.utils.Constants; -import com.diyfever.gui.miscutils.ConfigurationManager; - @ComponentDescriptor(name = "Electrolytic Capacitor", author = "Branislav Stojkovic", category = "Passive", creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "C", description = "Vertical mounted electrolytic capacitor, polarized or bipolar", zOrder = IDIYComponent.COMPONENT) public class RadialElectrolytic extends AbstractLeadedComponent { diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/Resistor.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/Resistor.java index d47e14af..3f105d6b 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/Resistor.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/Resistor.java @@ -10,7 +10,6 @@ import org.diylc.common.ResistorColorCode; import org.diylc.components.AbstractLeadedComponent; import org.diylc.core.CreationMethod; import org.diylc.core.IDIYComponent; -import org.diylc.core.Theme; import org.diylc.core.annotations.ComponentDescriptor; import org.diylc.core.annotations.EditableProperty; import org.diylc.core.annotations.PositiveMeasureValidator; diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/DIL_IC.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/DIL_IC.java index 3ae3d17f..6f719bf7 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/DIL_IC.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/DIL_IC.java @@ -12,6 +12,7 @@ import java.awt.geom.Ellipse2D; import java.awt.geom.Rectangle2D; import java.awt.geom.RoundRectangle2D; +import org.diylc.appframework.miscutils.ConfigurationManager; import org.diylc.common.IPlugInPort; import org.diylc.common.ObjectCache; import org.diylc.common.Orientation; @@ -28,8 +29,6 @@ import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; import org.diylc.utils.Constants; -import com.diyfever.gui.miscutils.ConfigurationManager; - @ComponentDescriptor(name = "DIL IC", author = "Branislav Stojkovic", category = "Semiconductors", instanceNamePrefix = "IC", description = "IC with rectangular housing and two parallel rows of pins", stretchable = false, zOrder = IDIYComponent.COMPONENT) public class DIL_IC extends AbstractTransparentComponent { diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/DiodePlastic.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/DiodePlastic.java index 870ec92b..bd7d4e2f 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/DiodePlastic.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/DiodePlastic.java @@ -5,6 +5,7 @@ import java.awt.Graphics2D; import java.awt.Shape; import java.awt.geom.Rectangle2D; +import org.diylc.appframework.miscutils.ConfigurationManager; import org.diylc.common.IPlugInPort; import org.diylc.components.AbstractLeadedComponent; import org.diylc.core.CreationMethod; @@ -16,8 +17,6 @@ import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; import org.diylc.utils.Constants; -import com.diyfever.gui.miscutils.ConfigurationManager; - @ComponentDescriptor(name = "Diode (plastic)", author = "Branislav Stojkovic", category = "Semiconductors", creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "D", description = "Plastic diode, like most rectifier, zener, schottky, etc.", zOrder = IDIYComponent.COMPONENT) public class DiodePlastic extends AbstractLeadedComponent { diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/LED.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/LED.java index 3421ec18..e58abe2a 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/LED.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/LED.java @@ -11,7 +11,6 @@ import org.diylc.common.ObjectCache; import org.diylc.components.AbstractLeadedComponent; import org.diylc.core.CreationMethod; import org.diylc.core.IDIYComponent; -import org.diylc.core.Theme; import org.diylc.core.annotations.ComponentDescriptor; import org.diylc.core.annotations.EditableProperty; import org.diylc.core.measures.Size; diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/TransistorTO220.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/TransistorTO220.java index a8061358..b9fa581a 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/TransistorTO220.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/TransistorTO220.java @@ -10,6 +10,7 @@ import java.awt.Rectangle; import java.awt.Shape; import java.awt.geom.Rectangle2D; +import org.diylc.appframework.miscutils.ConfigurationManager; import org.diylc.common.IPlugInPort; import org.diylc.common.ObjectCache; import org.diylc.common.Orientation; @@ -26,8 +27,6 @@ import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; import org.diylc.utils.Constants; -import com.diyfever.gui.miscutils.ConfigurationManager; - @ComponentDescriptor(name = "Transistor (TO-220 package)", author = "Branislav Stojkovic", category = "Semiconductors", instanceNamePrefix = "Q", description = "Transistors with metal tab for heat sink mounting", stretchable = false, zOrder = IDIYComponent.COMPONENT) public class TransistorTO220 extends AbstractTransparentComponent { diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/TransistorTO92.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/TransistorTO92.java index 2966c3bb..69d50eb9 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/TransistorTO92.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/TransistorTO92.java @@ -11,6 +11,7 @@ import java.awt.geom.Area; import java.awt.geom.Ellipse2D; import java.awt.geom.Rectangle2D; +import org.diylc.appframework.miscutils.ConfigurationManager; import org.diylc.common.IPlugInPort; import org.diylc.common.ObjectCache; import org.diylc.common.Orientation; @@ -27,8 +28,6 @@ import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; import org.diylc.utils.Constants; -import com.diyfever.gui.miscutils.ConfigurationManager; - @ComponentDescriptor(name = "Transistor (TO-92 package)", author = "Branislav Stojkovic", category = "Semiconductors", instanceNamePrefix = "Q", description = "Transistor with small plastic or epoxy body", stretchable = false, zOrder = IDIYComponent.COMPONENT) public class TransistorTO92 extends AbstractTransparentComponent { diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/tube/TubeSocket.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/tube/TubeSocket.java index e6b51cba..52c5ca47 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/tube/TubeSocket.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/tube/TubeSocket.java @@ -9,6 +9,7 @@ import java.awt.Shape; import java.awt.geom.Area; import java.awt.geom.Ellipse2D; +import org.diylc.appframework.miscutils.ConfigurationManager; import org.diylc.common.IPlugInPort; import org.diylc.common.ObjectCache; import org.diylc.common.Orientation; @@ -25,8 +26,6 @@ import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; import org.diylc.utils.Constants; -import com.diyfever.gui.miscutils.ConfigurationManager; - @ComponentDescriptor(name = "Tube Socket", author = "Branislav Stojkovic", category = "Tubes", instanceNamePrefix = "V", description = "Various types of tube/valve sockets", stretchable = false, zOrder = IDIYComponent.COMPONENT) public class TubeSocket extends AbstractTransparentComponent { diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/app-framework.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/app-framework.jar index da3fb559..604c5faa 100644 Binary files a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/app-framework.jar and b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/app-framework.jar differ diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/swing-framework.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/swing-framework.jar index af28398a..05939afc 100644 Binary files a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/swing-framework.jar and b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/swing-framework.jar differ diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/library/main.jar index 1d01f378..90d9cd1c 100644 Binary files a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/library/main.jar and b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/library/main.jar differ diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/DIYLCStarter.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/DIYLCStarter.java index 850c355f..e695f021 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/DIYLCStarter.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/DIYLCStarter.java @@ -8,13 +8,12 @@ import javax.swing.UIManager; import org.apache.log4j.Logger; import org.apache.log4j.PropertyConfigurator; +import org.diylc.appframework.miscutils.ConfigurationManager; +import org.diylc.appframework.miscutils.PropertyInjector; import org.diylc.presenter.Presenter; import org.diylc.swing.gui.MainFrame; import org.diylc.swing.gui.TemplateDialog; -import com.diyfever.gui.miscutils.ConfigurationManager; -import com.diyfever.gui.miscutils.PropertyInjector; - /** * Main class that runs DIYLC. * diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/ActionFactory.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/ActionFactory.java index 4fd80d3a..3343ff89 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/ActionFactory.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/ActionFactory.java @@ -12,6 +12,7 @@ import javax.swing.AbstractAction; import javax.swing.KeyStroke; import org.apache.log4j.Logger; +import org.diylc.appframework.miscutils.ConfigurationManager; import org.diylc.common.IPlugInPort; import org.diylc.common.ITask; import org.diylc.common.PropertyWrapper; @@ -26,11 +27,10 @@ import org.diylc.swing.plugins.file.BomDialog; import org.diylc.swing.plugins.file.BomEntry; import org.diylc.swing.plugins.file.BomMaker; import org.diylc.swing.plugins.file.FileFilterEnum; +import org.diylc.swingframework.ButtonDialog; +import org.diylc.swingframework.IDrawingProvider; +import org.diylc.swingframework.export.DrawingExporter; -import com.diyfever.gui.ButtonDialog; -import com.diyfever.gui.IDrawingProvider; -import com.diyfever.gui.export.DrawingExporter; -import com.diyfever.gui.miscutils.ConfigurationManager; import com.rits.cloning.Cloner; public class ActionFactory { diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/DialogFactory.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/DialogFactory.java index d5a3b031..65744cb9 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/DialogFactory.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/DialogFactory.java @@ -8,6 +8,7 @@ import javax.swing.JFileChooser; import javax.swing.JFrame; import javax.swing.filechooser.FileFilter; +import org.diylc.appframework.miscutils.ConfigurationManager; import org.diylc.common.PropertyWrapper; import org.diylc.swing.gui.components.OverwritePromptFileChooser; import org.diylc.swing.gui.editor.PropertyEditorDialog; @@ -16,11 +17,9 @@ import org.diylc.swing.plugins.file.BomEntry; import org.diylc.swing.plugins.online.view.LoginDialog; import org.diylc.swing.plugins.online.view.NewUserDialog; import org.diylc.swing.plugins.online.view.UploadDialog; - -import com.diyfever.gui.AboutDialog; -import com.diyfever.gui.IFileChooserAccessory; -import com.diyfever.gui.ProgressDialog; -import com.diyfever.gui.miscutils.ConfigurationManager; +import org.diylc.swingframework.AboutDialog; +import org.diylc.swingframework.IFileChooserAccessory; +import org.diylc.swingframework.ProgressDialog; public class DialogFactory { diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/MainFrame.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/MainFrame.java index 5bf68978..2738ecc2 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/MainFrame.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/MainFrame.java @@ -36,6 +36,7 @@ import javax.swing.SwingWorker; import javax.swing.Timer; import org.apache.log4j.Logger; +import org.diylc.appframework.miscutils.ConfigurationManager; import org.diylc.common.BadPositionException; import org.diylc.common.EventType; import org.diylc.common.IPlugIn; @@ -56,9 +57,7 @@ import org.diylc.swing.plugins.help.HelpMenuPlugin; import org.diylc.swing.plugins.layers.LayersMenuPlugin; import org.diylc.swing.plugins.statusbar.StatusBar; import org.diylc.swing.plugins.toolbox.ToolBox; - -import com.diyfever.gui.ButtonDialog; -import com.diyfever.gui.miscutils.ConfigurationManager; +import org.diylc.swingframework.ButtonDialog; public class MainFrame extends JFrame implements ISwingUI { diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/TemplateDialog.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/TemplateDialog.java index 385a4184..569a5da9 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/TemplateDialog.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/TemplateDialog.java @@ -33,14 +33,13 @@ import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import org.apache.log4j.Logger; +import org.diylc.appframework.miscutils.ConfigurationManager; import org.diylc.common.DrawOption; import org.diylc.common.IPlugInPort; import org.diylc.common.PropertyWrapper; import org.diylc.core.IView; import org.diylc.presenter.Presenter; -import com.diyfever.gui.miscutils.ConfigurationManager; - public class TemplateDialog extends JDialog { private static final long serialVersionUID = 1L; diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/editor/FontEditor.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/editor/FontEditor.java index 64471349..cc37c5b9 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/editor/FontEditor.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/editor/FontEditor.java @@ -6,10 +6,9 @@ import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import org.diylc.common.PropertyWrapper; +import org.diylc.swingframework.FontChooserComboBox; import org.diylc.utils.Constants; -import com.diyfever.gui.FontChooserComboBox; - public class FontEditor extends FontChooserComboBox { private static final long serialVersionUID = 1L; diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/editor/IntEditor.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/editor/IntEditor.java index 919c7949..9c316d87 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/editor/IntEditor.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/editor/IntEditor.java @@ -6,10 +6,9 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import org.diylc.common.PropertyWrapper; +import org.diylc.swingframework.DoubleTextField; import org.diylc.utils.Constants; -import com.diyfever.gui.DoubleTextField; - public class IntEditor extends DoubleTextField { private static final long serialVersionUID = 1L; diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/editor/MeasureEditor.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/editor/MeasureEditor.java index c16d6bc2..63481836 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/editor/MeasureEditor.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/editor/MeasureEditor.java @@ -15,10 +15,9 @@ import javax.swing.JComboBox; import org.diylc.common.PropertyWrapper; import org.diylc.core.measures.AbstractMeasure; import org.diylc.core.measures.Unit; +import org.diylc.swingframework.DoubleTextField; import org.diylc.utils.Constants; -import com.diyfever.gui.DoubleTextField; - public class MeasureEditor extends Container { private static final long serialVersionUID = 1L; diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/editor/PropertyEditorDialog.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/editor/PropertyEditorDialog.java index b8242a71..8f3bcc10 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/editor/PropertyEditorDialog.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/editor/PropertyEditorDialog.java @@ -24,8 +24,7 @@ import javax.swing.JPanel; import org.apache.log4j.Logger; import org.diylc.common.PropertyWrapper; import org.diylc.core.ValidationException; - -import com.diyfever.gui.ButtonDialog; +import org.diylc.swingframework.ButtonDialog; public class PropertyEditorDialog extends ButtonDialog { diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/autosave/AutoSavePlugin.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/autosave/AutoSavePlugin.java index d622272d..e402edb3 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/autosave/AutoSavePlugin.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/autosave/AutoSavePlugin.java @@ -7,13 +7,12 @@ import java.util.concurrent.Executors; import javax.swing.SwingUtilities; +import org.diylc.appframework.miscutils.ConfigurationManager; import org.diylc.common.EventType; import org.diylc.common.IPlugIn; import org.diylc.common.IPlugInPort; import org.diylc.core.IView; -import com.diyfever.gui.miscutils.ConfigurationManager; - public class AutoSavePlugin implements IPlugIn { private static final String AUTO_SAVE_FILE_NAME = "autoSave.diy"; diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPanel.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPanel.java index 83e8b9d9..3693e70e 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPanel.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPanel.java @@ -27,11 +27,10 @@ import javax.swing.AbstractAction; import javax.swing.JComponent; import javax.swing.KeyStroke; +import org.diylc.appframework.miscutils.ConfigurationManager; import org.diylc.common.DrawOption; import org.diylc.common.IPlugInPort; -import com.diyfever.gui.miscutils.ConfigurationManager; - /** * GUI class used to draw onto. * diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java index 6a7f32d5..2fc8ffb9 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java @@ -16,6 +16,8 @@ import javax.swing.JPopupMenu; import javax.swing.SwingConstants; import org.apache.log4j.Logger; +import org.diylc.appframework.miscutils.ConfigurationManager; +import org.diylc.appframework.miscutils.IConfigListener; import org.diylc.common.BadPositionException; import org.diylc.common.EventType; import org.diylc.common.IPlugIn; @@ -27,11 +29,8 @@ import org.diylc.swing.ActionFactory; import org.diylc.swing.ISwingUI; import org.diylc.swing.plugins.edit.ComponentTransferable; import org.diylc.swing.plugins.file.ProjectDrawingProvider; - -import com.diyfever.gui.miscutils.ConfigurationManager; -import com.diyfever.gui.miscutils.IConfigListener; -import com.diyfever.gui.ruler.IRulerListener; -import com.diyfever.gui.ruler.RulerScrollPane; +import org.diylc.swingframework.ruler.IRulerListener; +import org.diylc.swingframework.ruler.RulerScrollPane; public class CanvasPlugin implements IPlugIn, ClipboardOwner { diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/edit/EditMenuPlugin.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/edit/EditMenuPlugin.java index 9be4addb..6d981954 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/edit/EditMenuPlugin.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/edit/EditMenuPlugin.java @@ -8,6 +8,8 @@ import java.awt.datatransfer.FlavorListener; import java.awt.datatransfer.Transferable; import java.util.EnumSet; +import org.diylc.appframework.undo.IUndoListener; +import org.diylc.appframework.undo.UndoHandler; import org.diylc.common.EventType; import org.diylc.common.IPlugIn; import org.diylc.common.IPlugInPort; @@ -16,9 +18,6 @@ import org.diylc.images.IconLoader; import org.diylc.swing.ActionFactory; import org.diylc.swing.ISwingUI; -import com.diyfever.gui.undo.IUndoListener; -import com.diyfever.gui.undo.UndoHandler; - public class EditMenuPlugin implements IPlugIn, ClipboardOwner { private static final String EDIT_TITLE = "Edit"; diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/file/BomDialog.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/file/BomDialog.java index b3b51d4c..983164d9 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/file/BomDialog.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/file/BomDialog.java @@ -17,9 +17,8 @@ import javax.swing.JScrollPane; import org.diylc.images.IconLoader; import org.diylc.swing.gui.DialogFactory; - -import com.diyfever.gui.export.TableExporter; -import com.diyfever.gui.objecttable.ObjectListTable; +import org.diylc.swingframework.export.TableExporter; +import org.diylc.swingframework.objecttable.ObjectListTable; public class BomDialog extends JDialog { diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/file/ProjectDrawingProvider.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/file/ProjectDrawingProvider.java index 6290a124..6b30cd42 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/file/ProjectDrawingProvider.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/file/ProjectDrawingProvider.java @@ -5,11 +5,10 @@ import java.awt.Graphics; import java.awt.Graphics2D; import java.util.EnumSet; +import org.diylc.appframework.miscutils.ConfigurationManager; import org.diylc.common.DrawOption; import org.diylc.common.IPlugInPort; - -import com.diyfever.gui.IDrawingProvider; -import com.diyfever.gui.miscutils.ConfigurationManager; +import org.diylc.swingframework.IDrawingProvider; /** * {@link IDrawingProvider} implementation that uses {@link IPlugInPort} to draw diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/file/ProjectPreview.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/file/ProjectPreview.java index d5476264..4b2924b8 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/file/ProjectPreview.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/file/ProjectPreview.java @@ -24,8 +24,8 @@ import org.diylc.common.PropertyWrapper; import org.diylc.core.IView; import org.diylc.core.Project; import org.diylc.presenter.Presenter; +import org.diylc.swingframework.IFileChooserAccessory; -import com.diyfever.gui.IFileChooserAccessory; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.io.xml.DomDriver; diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/file/TraceMaskDrawingProvider.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/file/TraceMaskDrawingProvider.java index 06cb6aae..ebc737d0 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/file/TraceMaskDrawingProvider.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/file/TraceMaskDrawingProvider.java @@ -10,8 +10,7 @@ import org.diylc.common.IComponentFiler; import org.diylc.common.IPlugInPort; import org.diylc.core.IDIYComponent; import org.diylc.presenter.ComponentZOrderFiler; - -import com.diyfever.gui.IDrawingProvider; +import org.diylc.swingframework.IDrawingProvider; /** * {@link IDrawingProvider} implementation that uses {@link IPlugInPort} to draw diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/help/HelpMenuPlugin.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/help/HelpMenuPlugin.java index 3fb764c9..65e30e9b 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/help/HelpMenuPlugin.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/help/HelpMenuPlugin.java @@ -5,7 +5,6 @@ import java.util.EnumSet; import javax.swing.AbstractAction; import javax.swing.Icon; -import javax.swing.JOptionPane; import org.apache.log4j.Logger; import org.diylc.common.EventType; @@ -14,10 +13,9 @@ import org.diylc.common.IPlugInPort; import org.diylc.images.IconLoader; import org.diylc.swing.ISwingUI; import org.diylc.swing.gui.DialogFactory; - -import com.diyfever.gui.AboutDialog; -import com.diyfever.gui.LinkLabel; -import com.diyfever.gui.miscutils.Utils; +import org.diylc.swingframework.AboutDialog; +import org.diylc.swingframework.LinkLabel; +import org.diylc.swingframework.miscutils.Utils; /** * Entry point class for help-related utilities. diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/online/OnlineManager.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/online/OnlineManager.java index cd988389..c40512b2 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/online/OnlineManager.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/online/OnlineManager.java @@ -15,8 +15,7 @@ import org.diylc.swing.plugins.online.presenter.LibraryPresenter; import org.diylc.swing.plugins.online.view.LoginDialog; import org.diylc.swing.plugins.online.view.NewUserDialog; import org.diylc.swing.plugins.online.view.UploadDialog; - -import com.diyfever.gui.ProgressDialog; +import org.diylc.swingframework.ProgressDialog; public class OnlineManager implements IPlugIn { diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/online/view/LoginDialog.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/online/view/LoginDialog.java index 12c56f1a..820bb0e9 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/online/view/LoginDialog.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/online/view/LoginDialog.java @@ -16,7 +16,7 @@ import javax.swing.JTextField; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; -import com.diyfever.gui.ButtonDialog; +import org.diylc.swingframework.ButtonDialog; public class LoginDialog extends ButtonDialog { diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/online/view/NewUserDialog.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/online/view/NewUserDialog.java index 1f914071..752b6c70 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/online/view/NewUserDialog.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/online/view/NewUserDialog.java @@ -16,7 +16,7 @@ import javax.swing.JTextField; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; -import com.diyfever.gui.ButtonDialog; +import org.diylc.swingframework.ButtonDialog; public class NewUserDialog extends ButtonDialog { diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/online/view/UploadDialog.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/online/view/UploadDialog.java index 5c1249c2..15624506 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/online/view/UploadDialog.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/online/view/UploadDialog.java @@ -14,7 +14,7 @@ import javax.swing.UIManager; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import com.diyfever.gui.ButtonDialog; +import org.diylc.swingframework.ButtonDialog; public class UploadDialog extends ButtonDialog { diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/statusbar/StatusBar.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/statusbar/StatusBar.java index c2ac05e4..a552e562 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/statusbar/StatusBar.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/statusbar/StatusBar.java @@ -27,6 +27,8 @@ import javax.swing.JPanel; import javax.swing.SwingUtilities; import org.apache.log4j.Logger; +import org.diylc.appframework.miscutils.ConfigurationManager; +import org.diylc.appframework.miscutils.Utils; import org.diylc.common.BadPositionException; import org.diylc.common.ComponentType; import org.diylc.common.EventType; @@ -36,12 +38,9 @@ import org.diylc.core.IDIYComponent; import org.diylc.images.IconLoader; import org.diylc.presenter.Presenter; import org.diylc.swing.ISwingUI; - -import com.diyfever.gui.MemoryBar; -import com.diyfever.gui.miscutils.ConfigurationManager; -import com.diyfever.gui.miscutils.PercentageListCellRenderer; -import com.diyfever.gui.miscutils.Utils; -import com.diyfever.gui.update.UpdateLabel; +import org.diylc.swingframework.MemoryBar; +import org.diylc.swingframework.miscutils.PercentageListCellRenderer; +import org.diylc.swingframework.update.UpdateLabel; public class StatusBar extends JPanel implements IPlugIn { diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentButton.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentButton.java index e913051d..316781cf 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentButton.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentButton.java @@ -3,8 +3,6 @@ package org.diylc.swing.plugins.toolbox; import java.awt.Insets; import java.awt.dnd.DnDConstants; import java.awt.dnd.DragSource; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java index b1b6f1db..6632b93f 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java @@ -1,7 +1,6 @@ package org.diylc.swing.plugins.toolbox; import java.awt.BorderLayout; -import java.awt.Color; import java.awt.Component; import java.awt.Container; import java.util.ArrayList; @@ -17,6 +16,8 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import org.apache.log4j.Logger; +import org.diylc.appframework.miscutils.ConfigurationManager; +import org.diylc.appframework.miscutils.IConfigListener; import org.diylc.common.ComponentType; import org.diylc.common.IPlugInPort; import org.diylc.core.IDIYComponent; @@ -24,9 +25,6 @@ import org.diylc.presenter.ComparatorFactory; import org.diylc.presenter.ComponentProcessor; import org.diylc.presenter.Presenter; -import com.diyfever.gui.miscutils.ConfigurationManager; -import com.diyfever.gui.miscutils.IConfigListener; - /** * Tabbed pane that shows all available components categorized into tabs. * diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/test/org/diylc/TableTest.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/test/org/diylc/TableTest.java index d7755c7e..21578424 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/test/org/diylc/TableTest.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/test/org/diylc/TableTest.java @@ -9,9 +9,8 @@ import javax.swing.JScrollPane; import org.apache.log4j.BasicConfigurator; import org.diylc.swing.plugins.online.model.ProjectEntity; - -import com.diyfever.gui.objecttable.IActionProcessor; -import com.diyfever.gui.objecttable.ObjectListTable; +import org.diylc.swingframework.objecttable.IActionProcessor; +import org.diylc.swingframework.objecttable.ObjectListTable; public class TableTest {