This commit is contained in:
bancika
2011-01-04 19:07:30 +00:00
parent 50ac3a9487
commit 73da0f4a9b
46 changed files with 94 additions and 94 deletions
@@ -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;
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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;
/**
@@ -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;
/**
@@ -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;
/**
@@ -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;
@@ -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;
/**
@@ -1,4 +1,4 @@
package org.diylc.model;
package org.diylc.core;
/**
* Enumerates all drawing layers.
@@ -1,4 +1,4 @@
package org.diylc.model;
package org.diylc.core;
/**
* Enumerates all possible states that a component can be in.
@@ -1,4 +1,4 @@
package org.diylc.model;
package org.diylc.core;
import java.awt.Graphics2D;
import java.io.Serializable;
@@ -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;
/**
@@ -1,4 +1,4 @@
package org.diylc.model;
package org.diylc.core;
/**
* Enumerates control point visibility policies.
@@ -1,4 +1,4 @@
package org.diylc.model.annotations;
package org.diylc.core.annotations;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -1,4 +1,4 @@
package org.diylc.model.annotations;
package org.diylc.core.annotations;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -1,4 +1,4 @@
package org.diylc.model.annotations;
package org.diylc.core.annotations;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -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;
/**
@@ -1,4 +1,4 @@
package org.diylc.model.annotations;
package org.diylc.core.annotations;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -1,4 +1,4 @@
package org.diylc.model.measures;
package org.diylc.core.measures;
import java.io.Serializable;
import java.text.DecimalFormat;
@@ -1,4 +1,4 @@
package org.diylc.model.measures;
package org.diylc.core.measures;
public class Capacitance extends AbstractMeasure<CapacitanceUnit> {
@@ -1,4 +1,4 @@
package org.diylc.model.measures;
package org.diylc.core.measures;
public enum CapacitanceUnit implements Unit {
@@ -1,4 +1,4 @@
package org.diylc.model.measures;
package org.diylc.core.measures;
public class Converter {
@@ -1,4 +1,4 @@
package org.diylc.model.measures;
package org.diylc.core.measures;
public class Inductance extends AbstractMeasure<InductanceUnit> {
@@ -1,4 +1,4 @@
package org.diylc.model.measures;
package org.diylc.core.measures;
public enum InductanceUnit implements Unit {
@@ -1,4 +1,4 @@
package org.diylc.model.measures;
package org.diylc.core.measures;
public class Resistance extends AbstractMeasure<ResistanceUnit> {
@@ -1,4 +1,4 @@
package org.diylc.model.measures;
package org.diylc.core.measures;
public enum ResistanceUnit implements Unit {
@@ -1,4 +1,4 @@
package org.diylc.model.measures;
package org.diylc.core.measures;
import java.awt.Toolkit;
@@ -1,4 +1,4 @@
package org.diylc.model.measures;
package org.diylc.core.measures;
public enum SizeUnit implements Unit {
@@ -1,4 +1,4 @@
package org.diylc.model.measures;
package org.diylc.core.measures;
public interface Unit {
@@ -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;
@@ -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 {
@@ -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;
@@ -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 {
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
/**
@@ -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 {
@@ -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;
@@ -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;
@@ -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;