diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/DIYLCStarter.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/DIYLCStarter.java index c2a81be4..2b6914df 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/DIYLCStarter.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/DIYLCStarter.java @@ -8,8 +8,8 @@ import javax.swing.UIManager; import org.apache.log4j.Logger; import org.apache.log4j.PropertyConfigurator; -import org.diylc.gui.MainFrame; import org.diylc.presenter.Presenter; +import org.diylc.swing.gui.MainFrame; import com.diyfever.gui.miscutils.PropertyInjector; 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 6309534d..cc07172c 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 @@ -8,12 +8,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.swing.Action; -import javax.swing.Icon; -import javax.swing.JComponent; -import javax.swing.SwingConstants; -import javax.swing.JPopupMenu.Separator; - import org.diylc.core.IDIYComponent; import org.diylc.core.Project; @@ -132,49 +126,6 @@ public interface IPlugInPort { */ void draw(Graphics2D g2d, Set drawOptions, IComponentFiler filter); - /** - * Injects a custom GUI panels provided by the plug-in and desired position - * in the window. Application will layout plug-in panels accordingly.
- * Valid positions are: - * - * - * Center position is reserved for the main canvas panel and cannot be used. - * - * @param component - * @param position - * @throws BadPositionException - * in case invalid position is specified - */ - void injectGUIComponent(JComponent component, int position) throws BadPositionException; - - /** - * Injects a custom menu action into application's main menu. If - * action is set to null {@link Separator} will be added. If - * the specified menu does not exist it will be automatically created. - * - * @param action - * {@link Action} to inser - * @param menuName - * name of the menu to insert into - */ - void injectMenuAction(Action action, String menuName); - - /** - * Injects a custom submenu into application's main menu. If - * action is set to null {@link Separator} will be added. If - * the specified menu does not exist it will be automatically created. - * - * @param name - * @param icon - * @param parentMenuName - */ - void injectSubmenu(String name, Icon icon, String parentMenuName); - Double[] getAvailableZoomLevels(); /** diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/IView.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/IView.java index e36aa211..0dad7831 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/IView.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/IView.java @@ -1,11 +1,5 @@ package org.diylc.core; -import javax.swing.Action; -import javax.swing.Icon; -import javax.swing.JComponent; - -import org.diylc.common.BadPositionException; -import org.diylc.common.IPlugInPort; /** * Base interface for the main GUI component. @@ -28,40 +22,6 @@ public interface IView { public static final int CANCEL_OPTION = 2; public static final int OK_OPTION = 0; - /** - * Adds a component to the view. - * - * @param component - * component to insert - * @param position - * target position - * @throws BadPositionException - * - * @see IPlugInPort#injectGUIComponent - */ - void addComponent(JComponent component, int position) throws BadPositionException; - - /** - * Adds a menu action. - * - * @param action - * action to insert - * @param menuName - * target menu name - * - * @see IPlugInPort#injectMenuAction - */ - void addMenuAction(Action action, String menuName); - - /** - * Adds a submenu to an existing menu. - * - * @param name - * @param icon - * @param parentMenuName - */ - void addSubmenu(String name, Icon icon, String parentMenuName); - void showMessage(String message, String title, int messageType); int showConfirmDialog(String message, String title, int optionType, int messageType); 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 188b36d9..fe8eac5c 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 @@ -19,12 +19,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.swing.Action; -import javax.swing.Icon; -import javax.swing.JComponent; - import org.apache.log4j.Logger; -import org.diylc.common.BadPositionException; import org.diylc.common.ComponentSelection; import org.diylc.common.ComponentType; import org.diylc.common.DrawOption; @@ -309,26 +304,6 @@ public class Presenter implements IPlugInPort { .getPotentialControlPoint()), componentSlotToDraw, dragInProgress); } - @Override - public void injectGUIComponent(JComponent component, int position) throws BadPositionException { - LOG.info(String.format("injectGUIComponent(%s, %s)", component.getClass().getName(), - position)); - view.addComponent(component, position); - } - - @Override - public void injectMenuAction(Action action, String menuName) { - LOG.info(String.format("injectMenuAction(%s, %s)", action == null ? "Separator" : action - .getValue(Action.NAME), menuName)); - view.addMenuAction(action, menuName); - } - - @Override - public void injectSubmenu(String name, Icon icon, String parentMenuName) { - LOG.info(String.format("injectSubmenu(%s, icon, %s)", name, parentMenuName)); - view.addSubmenu(name, icon, parentMenuName); - } - /** * Finds all components whose areas include the specified {@link Point}. * Point is not scaled by the zoom factor. Components that belong to @@ -604,7 +579,8 @@ public class Presenter implements IPlugInPort { for (IDIYComponent component : currentProject.getComponents()) { ComponentType componentType = componentTypeMap.get(component.getClass().getName()); - // Do not process a component if it's already in the map and if it's locked. + // Do not process a component if it's already in the map and if it's + // locked. if (!controlPointMap.containsKey(component) && !isComponentLocked(component)) { // Check if there's a control point in the current selection // that matches with one of its control points. @@ -700,20 +676,24 @@ public class Presenter implements IPlugInPort { } // Update all points. + boolean isFirst = true; for (Map.Entry, Set> entry : controlPointMap.entrySet()) { IDIYComponent c = entry.getKey(); // drawingManager.invalidateComponent(c); for (Integer index : entry.getValue()) { Point p = new Point(c.getControlPoint(index)); - p.translate(dx, dy); - if (snapToGrid) { - CalcUtils.snapPointToGrid(p, currentProject.getGridSpacing()); - } // When the first point is moved, calculate how much it // actually moved after snapping. - if (actualDx == 0 && actualDy == 0) { + if (isFirst) { + isFirst = false; + p.translate(dx, dy); + if (snapToGrid) { + CalcUtils.snapPointToGrid(p, currentProject.getGridSpacing()); + } actualDx = p.x - c.getControlPoint(index).x; actualDy = p.y - c.getControlPoint(index).y; + } else { + p.translate(actualDx, actualDy); } c.setControlPoint(p, index); } diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/ISwingUI.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/ISwingUI.java new file mode 100644 index 00000000..0fa341a2 --- /dev/null +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/ISwingUI.java @@ -0,0 +1,60 @@ +package org.diylc.swing; + +import javax.swing.Action; +import javax.swing.Icon; +import javax.swing.JComponent; +import javax.swing.SwingConstants; +import javax.swing.JPopupMenu.Separator; + +import org.diylc.common.BadPositionException; + +/** + * Interface for plugin access to the swing front end. + * + * @author Branislav Stojkovic + */ +public interface ISwingUI { + + /** + * Injects a custom GUI panels provided by the plug-in and desired position + * in the window. Application will layout plug-in panels accordingly.
+ * Valid positions are: + *
    + *
  • {@link SwingConstants#TOP}
    • + *
  • {@link SwingConstants#BOTTOM}
    • + *
  • {@link SwingConstants#LEFT}
    • + *
  • {@link SwingConstants#RIGHT}
    • + *
+ * + * Center position is reserved for the main canvas panel and cannot be used. + * + * @param component + * @param position + * @throws BadPositionException + * in case invalid position is specified + */ + void injectGUIComponent(JComponent component, int position) throws BadPositionException; + + /** + * Injects a custom menu action into application's main menu. If + * action is set to null {@link Separator} will be added. If + * the specified menu does not exist it will be automatically created. + * + * @param action + * {@link Action} to inser + * @param menuName + * name of the menu to insert into + */ + void injectMenuAction(Action action, String menuName); + + /** + * Injects a custom submenu into application's main menu. If + * action is set to null {@link Separator} will be added. If + * the specified menu does not exist it will be automatically created. + * + * @param name + * @param icon + * @param parentMenuName + */ + void injectSubmenu(String name, Icon icon, String parentMenuName); +} diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/CustomGlassPane.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/CustomGlassPane.java similarity index 92% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/CustomGlassPane.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/CustomGlassPane.java index 276a06fe..9852bdcd 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/CustomGlassPane.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/CustomGlassPane.java @@ -1,4 +1,4 @@ -package org.diylc.gui; +package org.diylc.swing.gui; import java.awt.Graphics; import java.awt.Graphics2D; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/DialogFactory.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/DialogFactory.java similarity index 88% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/DialogFactory.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/DialogFactory.java index 5e976fef..d5a3b031 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/DialogFactory.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/DialogFactory.java @@ -1,4 +1,4 @@ -package org.diylc.gui; +package org.diylc.swing.gui; import java.io.File; import java.util.List; @@ -9,13 +9,13 @@ import javax.swing.JFrame; import javax.swing.filechooser.FileFilter; import org.diylc.common.PropertyWrapper; -import org.diylc.gui.components.OverwritePromptFileChooser; -import org.diylc.gui.editor.PropertyEditorDialog; -import org.diylc.plugins.file.BomDialog; -import org.diylc.plugins.file.BomEntry; -import org.diylc.plugins.online.view.LoginDialog; -import org.diylc.plugins.online.view.NewUserDialog; -import org.diylc.plugins.online.view.UploadDialog; +import org.diylc.swing.gui.components.OverwritePromptFileChooser; +import org.diylc.swing.gui.editor.PropertyEditorDialog; +import org.diylc.swing.plugins.file.BomDialog; +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; 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/swing/gui/MainFrame.java similarity index 77% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/MainFrame.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/MainFrame.java index ef006b72..c3ab7a4f 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/swing/gui/MainFrame.java @@ -1,4 +1,4 @@ -package org.diylc.gui; +package org.diylc.swing.gui; import java.awt.BorderLayout; import java.awt.Container; @@ -25,22 +25,26 @@ import javax.swing.JPanel; import javax.swing.SwingConstants; import javax.swing.Timer; +import org.apache.log4j.Logger; import org.diylc.common.BadPositionException; import org.diylc.common.EventType; import org.diylc.common.IPlugIn; import org.diylc.common.IPlugInPort; import org.diylc.core.IView; import org.diylc.images.IconLoader; -import org.diylc.plugins.canvas.CanvasPlugin; -import org.diylc.plugins.clipboard.EditMenuPlugin; -import org.diylc.plugins.file.FileMenuPlugin; -import org.diylc.plugins.help.HelpMenuPlugin; -import org.diylc.plugins.layers.LayersMenuPlugin; -import org.diylc.plugins.statusbar.StatusBar; -import org.diylc.plugins.toolbox.ToolBox; import org.diylc.presenter.Presenter; +import org.diylc.swing.ISwingUI; +import org.diylc.swing.plugins.canvas.CanvasPlugin; +import org.diylc.swing.plugins.clipboard.EditMenuPlugin; +import org.diylc.swing.plugins.file.FileMenuPlugin; +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; -public class MainFrame extends JFrame implements IView { +public class MainFrame extends JFrame implements IView, ISwingUI { + + private static final Logger LOG = Logger.getLogger(MainFrame.class); private static final long serialVersionUID = 1L; @@ -69,15 +73,15 @@ public class MainFrame extends JFrame implements IView { this.presenter = new Presenter(this); - presenter.installPlugin(new ToolBox()); - presenter.installPlugin(new FileMenuPlugin()); - presenter.installPlugin(new EditMenuPlugin()); - presenter.installPlugin(new LayersMenuPlugin()); + presenter.installPlugin(new ToolBox(this)); + presenter.installPlugin(new FileMenuPlugin(this)); + presenter.installPlugin(new EditMenuPlugin(this)); + presenter.installPlugin(new LayersMenuPlugin(this)); // presenter.installPlugin(new OnlineManager()); - presenter.installPlugin(new HelpMenuPlugin()); + presenter.installPlugin(new HelpMenuPlugin(this)); - presenter.installPlugin(new StatusBar()); - canvasPlugin = new CanvasPlugin(); + presenter.installPlugin(new StatusBar(this)); + canvasPlugin = new CanvasPlugin(this); presenter.installPlugin(canvasPlugin); presenter.installPlugin(new FramePlugin()); @@ -170,7 +174,31 @@ public class MainFrame extends JFrame implements IView { // IView @Override - public void addComponent(JComponent component, int position) throws BadPositionException { + public void showMessage(String message, String title, int messageType) { + JOptionPane.showMessageDialog(this, message, title, messageType); + } + + @Override + public int showConfirmDialog(String message, String title, int optionType, int messageType) { + return JOptionPane.showConfirmDialog(this, message, title, optionType, messageType); + } + + private JMenu findOrCreateMenu(String menuName) { + JMenu menu; + if (menuMap.containsKey(menuName)) { + menu = menuMap.get(menuName); + } else { + menu = new JMenu(menuName); + menuMap.put(menuName, menu); + getMainMenuBar().add(menu); + } + return menu; + } + + @Override + public void injectGUIComponent(JComponent component, int position) throws BadPositionException { + LOG.info(String.format("injectGUIComponent(%s, %s)", component.getClass().getName(), + position)); switch (position) { case SwingConstants.TOP: topPanel.add(component); @@ -194,7 +222,9 @@ public class MainFrame extends JFrame implements IView { } @Override - public void addMenuAction(Action action, String menuName) { + public void injectMenuAction(Action action, String menuName) { + LOG.info(String.format("injectMenuAction(%s, %s)", action == null ? "Separator" : action + .getValue(Action.NAME), menuName)); JMenu menu = findOrCreateMenu(menuName); if (action == null) { menu.addSeparator(); @@ -209,7 +239,8 @@ public class MainFrame extends JFrame implements IView { } @Override - public void addSubmenu(String name, Icon icon, String parentMenuName) { + public void injectSubmenu(String name, Icon icon, String parentMenuName) { + LOG.info(String.format("injectSubmenu(%s, icon, %s)", name, parentMenuName)); JMenu menu = findOrCreateMenu(parentMenuName); JMenu submenu = new JMenu(name); submenu.setIcon(icon); @@ -217,28 +248,6 @@ public class MainFrame extends JFrame implements IView { menuMap.put(name, submenu); } - @Override - public void showMessage(String message, String title, int messageType) { - JOptionPane.showMessageDialog(this, message, title, messageType); - } - - @Override - public int showConfirmDialog(String message, String title, int optionType, int messageType) { - return JOptionPane.showConfirmDialog(this, message, title, optionType, messageType); - } - - private JMenu findOrCreateMenu(String menuName) { - JMenu menu; - if (menuMap.containsKey(menuName)) { - menu = menuMap.get(menuName); - } else { - menu = new JMenu(menuName); - menuMap.put(menuName, menu); - getMainMenuBar().add(menu); - } - return menu; - } - class FramePlugin implements IPlugIn { private IPlugInPort plugInPort; @@ -266,4 +275,5 @@ public class MainFrame extends JFrame implements IView { } } } + } diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/components/OverwritePromptFileChooser.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/components/OverwritePromptFileChooser.java similarity index 93% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/components/OverwritePromptFileChooser.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/components/OverwritePromptFileChooser.java index a2ed02c9..514d47eb 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/components/OverwritePromptFileChooser.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/components/OverwritePromptFileChooser.java @@ -1,4 +1,4 @@ -package org.diylc.gui.components; +package org.diylc.swing.gui.components; import java.io.File; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/ByteEditor.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/editor/ByteEditor.java similarity index 90% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/ByteEditor.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/editor/ByteEditor.java index a501e3fe..8403b42a 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/ByteEditor.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/editor/ByteEditor.java @@ -1,4 +1,4 @@ -package org.diylc.gui.editor; +package org.diylc.swing.gui.editor; import javax.swing.JSlider; import javax.swing.event.ChangeEvent; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/ColorEditor.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/editor/ColorEditor.java similarity index 93% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/ColorEditor.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/editor/ColorEditor.java index 9a108417..d78a58d5 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/ColorEditor.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/editor/ColorEditor.java @@ -1,4 +1,4 @@ -package org.diylc.gui.editor; +package org.diylc.swing.gui.editor; import java.awt.Color; import java.awt.Cursor; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/EnumEditor.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/editor/EnumEditor.java similarity index 91% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/EnumEditor.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/editor/EnumEditor.java index af41e5c1..b9fe5596 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/EnumEditor.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/editor/EnumEditor.java @@ -1,4 +1,4 @@ -package org.diylc.gui.editor; +package org.diylc.swing.gui.editor; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; 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/swing/gui/editor/FieldEditorFactory.java similarity index 93% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/FieldEditorFactory.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/editor/FieldEditorFactory.java index 104ebf0d..3743aed6 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/swing/gui/editor/FieldEditorFactory.java @@ -1,4 +1,4 @@ -package org.diylc.gui.editor; +package org.diylc.swing.gui.editor; import java.awt.Color; import java.awt.Component; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/FontEditor.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/editor/FontEditor.java similarity index 93% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/FontEditor.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/editor/FontEditor.java index 60842d10..bac4ee25 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/FontEditor.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/editor/FontEditor.java @@ -1,4 +1,4 @@ -package org.diylc.gui.editor; +package org.diylc.swing.gui.editor; import java.awt.Color; import java.awt.Cursor; 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/swing/gui/editor/MeasureEditor.java similarity index 95% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/MeasureEditor.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/editor/MeasureEditor.java index df0e8080..2f6e51fc 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/swing/gui/editor/MeasureEditor.java @@ -1,4 +1,4 @@ -package org.diylc.gui.editor; +package org.diylc.swing.gui.editor; import java.awt.BorderLayout; import java.awt.Container; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/PropertyEditorDialog.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/editor/PropertyEditorDialog.java similarity index 95% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/PropertyEditorDialog.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/editor/PropertyEditorDialog.java index f55268dd..6ff3ebe3 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/PropertyEditorDialog.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/editor/PropertyEditorDialog.java @@ -1,4 +1,4 @@ -package org.diylc.gui.editor; +package org.diylc.swing.gui.editor; import java.awt.Component; import java.awt.Dimension; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/StringEditor.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/editor/StringEditor.java similarity index 91% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/StringEditor.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/editor/StringEditor.java index 48ecc064..c163e6d3 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/StringEditor.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/editor/StringEditor.java @@ -1,4 +1,4 @@ -package org.diylc.gui.editor; +package org.diylc.swing.gui.editor; import javax.swing.JTextField; import javax.swing.event.DocumentEvent; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/CanvasGestureListener.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/CanvasGestureListener.java similarity index 91% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/CanvasGestureListener.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/CanvasGestureListener.java index 04ad5d49..f8273c2a 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/CanvasGestureListener.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/CanvasGestureListener.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.canvas; +package org.diylc.swing.plugins.canvas; import java.awt.dnd.DragGestureEvent; import java.awt.dnd.DragGestureListener; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/CanvasPanel.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/CanvasPanel.java similarity index 94% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/CanvasPanel.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/CanvasPanel.java index 95262553..941d775c 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/CanvasPanel.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/CanvasPanel.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.canvas; +package org.diylc.swing.plugins.canvas; import java.awt.Graphics; import java.awt.Graphics2D; @@ -31,8 +31,8 @@ import javax.swing.KeyStroke; import org.diylc.common.DrawOption; import org.diylc.common.IPlugInPort; import org.diylc.common.PropertyWrapper; -import org.diylc.gui.DialogFactory; -import org.diylc.gui.editor.PropertyEditorDialog; +import org.diylc.swing.gui.DialogFactory; +import org.diylc.swing.gui.editor.PropertyEditorDialog; import com.diyfever.gui.ButtonDialog; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/CanvasPlugin.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java similarity index 90% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/CanvasPlugin.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java index 8347f444..de35340e 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/CanvasPlugin.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.canvas; +package org.diylc.swing.plugins.canvas; import java.awt.Dimension; import java.awt.Rectangle; @@ -16,8 +16,9 @@ import org.diylc.common.IPlugIn; import org.diylc.common.IPlugInPort; import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; -import org.diylc.plugins.file.ProjectDrawingProvider; import org.diylc.presenter.Presenter; +import org.diylc.swing.ISwingUI; +import org.diylc.swing.plugins.file.ProjectDrawingProvider; import com.diyfever.gui.miscutils.ConfigurationManager; import com.diyfever.gui.ruler.IRulerListener; @@ -31,14 +32,17 @@ public class CanvasPlugin implements IPlugIn { private CanvasPanel canvasPanel; private IPlugInPort plugInPort; - public CanvasPlugin() { + private ISwingUI swingUI; + + public CanvasPlugin(ISwingUI swingUI) { + this.swingUI = swingUI; } @Override public void connect(IPlugInPort plugInPort) { this.plugInPort = plugInPort; try { - plugInPort.injectGUIComponent(getScrollPane(), SwingConstants.CENTER); + swingUI.injectGUIComponent(getScrollPane(), SwingConstants.CENTER); } catch (BadPositionException e) { LOG.error("Could not install canvas plugin", e); } diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/CanvasSourceListener.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/CanvasSourceListener.java similarity index 92% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/CanvasSourceListener.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/CanvasSourceListener.java index 18e9a4b8..a63bffa3 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/CanvasSourceListener.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/CanvasSourceListener.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.canvas; +package org.diylc.swing.plugins.canvas; import java.awt.Point; import java.awt.dnd.DragSourceDragEvent; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/CanvasTargetListener.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/CanvasTargetListener.java similarity index 94% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/CanvasTargetListener.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/CanvasTargetListener.java index 4e3accfd..a96f6273 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/CanvasTargetListener.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/CanvasTargetListener.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.canvas; +package org.diylc.swing.plugins.canvas; import java.awt.Point; import java.awt.dnd.DnDConstants; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/EmptyTransferable.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/EmptyTransferable.java similarity index 89% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/EmptyTransferable.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/EmptyTransferable.java index 714245c8..ccddb7b1 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/EmptyTransferable.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/EmptyTransferable.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.canvas; +package org.diylc.swing.plugins.canvas; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/PointTransferable.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/PointTransferable.java similarity index 92% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/PointTransferable.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/PointTransferable.java index 17aa66b7..7c854f82 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/PointTransferable.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/PointTransferable.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.canvas; +package org.diylc.swing.plugins.canvas; import java.awt.Point; import java.awt.datatransfer.DataFlavor; 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/swing/plugins/canvas/SelectionTransferable.java similarity index 93% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/canvas/SelectionTransferable.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/SelectionTransferable.java index fd87e27f..5901d2fc 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/swing/plugins/canvas/SelectionTransferable.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.canvas; +package org.diylc.swing.plugins.canvas; import java.awt.Point; import java.awt.datatransfer.DataFlavor; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/clipboard/EditMenuPlugin.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/clipboard/EditMenuPlugin.java similarity index 87% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/clipboard/EditMenuPlugin.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/clipboard/EditMenuPlugin.java index 8985dcbb..50237d75 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/clipboard/EditMenuPlugin.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/clipboard/EditMenuPlugin.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.clipboard; +package org.diylc.swing.plugins.clipboard; import java.awt.Toolkit; import java.awt.datatransfer.Clipboard; @@ -22,9 +22,10 @@ import org.diylc.common.IPlugInPort; import org.diylc.common.PropertyWrapper; import org.diylc.core.IDIYComponent; import org.diylc.core.Project; -import org.diylc.gui.DialogFactory; -import org.diylc.gui.editor.PropertyEditorDialog; import org.diylc.images.IconLoader; +import org.diylc.swing.ISwingUI; +import org.diylc.swing.gui.DialogFactory; +import org.diylc.swing.gui.editor.PropertyEditorDialog; import com.diyfever.gui.ButtonDialog; import com.diyfever.gui.undo.IUndoListener; @@ -47,7 +48,7 @@ public class EditMenuPlugin implements IPlugIn, ClipboardOwner { private UndoHandler undoHandler; - public EditMenuPlugin() { + public EditMenuPlugin(ISwingUI swingUI) { clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); cloner = new Cloner(); undoHandler = new UndoHandler(new IUndoListener() { @@ -64,29 +65,29 @@ public class EditMenuPlugin implements IPlugIn, ClipboardOwner { refreshActions(); } }); + + swingUI.injectMenuAction(undoHandler.getUndoAction(), EDIT_TITLE); + swingUI.injectMenuAction(undoHandler.getRedoAction(), EDIT_TITLE); + swingUI.injectMenuAction(null, EDIT_TITLE); + // cutAction = new CutAction(); + // plugInPort.injectMenuAction(cutAction, EDIT_TITLE); + copyAction = new CopyAction(); + swingUI.injectMenuAction(copyAction, EDIT_TITLE); + pasteAction = new PasteAction(); + swingUI.injectMenuAction(pasteAction, EDIT_TITLE); + swingUI.injectMenuAction(null, EDIT_TITLE); + swingUI.injectMenuAction(new SelectAllAction(), EDIT_TITLE); + swingUI.injectMenuAction(null, EDIT_TITLE); + swingUI.injectMenuAction(new EditSelectionAction(), EDIT_TITLE); + swingUI.injectMenuAction(new EditProjectAction(), EDIT_TITLE); + swingUI.injectMenuAction(null, EDIT_TITLE); + swingUI.injectMenuAction(new GroupAction(), EDIT_TITLE); + swingUI.injectMenuAction(new UngroupAction(), EDIT_TITLE); } @Override public void connect(IPlugInPort plugInPort) { this.plugInPort = plugInPort; - plugInPort.injectMenuAction(undoHandler.getUndoAction(), EDIT_TITLE); - plugInPort.injectMenuAction(undoHandler.getRedoAction(), EDIT_TITLE); - plugInPort.injectMenuAction(null, EDIT_TITLE); - // cutAction = new CutAction(); - // plugInPort.injectMenuAction(cutAction, EDIT_TITLE); - copyAction = new CopyAction(); - plugInPort.injectMenuAction(copyAction, EDIT_TITLE); - pasteAction = new PasteAction(); - plugInPort.injectMenuAction(pasteAction, EDIT_TITLE); - plugInPort.injectMenuAction(null, EDIT_TITLE); - plugInPort.injectMenuAction(new SelectAllAction(), EDIT_TITLE); - plugInPort.injectMenuAction(null, EDIT_TITLE); - plugInPort.injectMenuAction(new EditSelectionAction(), EDIT_TITLE); - plugInPort.injectMenuAction(new EditProjectAction(), EDIT_TITLE); - plugInPort.injectMenuAction(null, EDIT_TITLE); - plugInPort.injectMenuAction(new GroupAction(), EDIT_TITLE); - plugInPort.injectMenuAction(new UngroupAction(), EDIT_TITLE); - refreshActions(); } diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/BomDialog.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/BomDialog.java similarity index 94% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/BomDialog.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/BomDialog.java index f23a1a1c..b3b51d4c 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/BomDialog.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/BomDialog.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.file; +package org.diylc.swing.plugins.file; import java.awt.BorderLayout; import java.awt.event.ActionEvent; @@ -15,8 +15,8 @@ import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.JScrollPane; -import org.diylc.gui.DialogFactory; import org.diylc.images.IconLoader; +import org.diylc.swing.gui.DialogFactory; import com.diyfever.gui.export.TableExporter; import com.diyfever.gui.objecttable.ObjectListTable; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/BomEntry.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/BomEntry.java similarity index 93% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/BomEntry.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/BomEntry.java index 0ccff48b..550a21d0 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/BomEntry.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/BomEntry.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.file; +package org.diylc.swing.plugins.file; public class BomEntry { 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/swing/plugins/file/BomMaker.java similarity index 93% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/BomMaker.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/BomMaker.java index 8ddb6888..1c3d7d73 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/swing/plugins/file/BomMaker.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.file; +package org.diylc.swing.plugins.file; import java.util.ArrayList; import java.util.Collections; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/FileFilterEnum.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/FileFilterEnum.java similarity index 92% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/FileFilterEnum.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/FileFilterEnum.java index 5a3bffc5..eb306edc 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/FileFilterEnum.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/FileFilterEnum.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.file; +package org.diylc.swing.plugins.file; import java.io.File; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/FileMenuPlugin.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/FileMenuPlugin.java similarity index 82% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/FileMenuPlugin.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/FileMenuPlugin.java index 48f945e1..3c10b80c 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/FileMenuPlugin.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/FileMenuPlugin.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.file; +package org.diylc.swing.plugins.file; import java.awt.event.ActionEvent; import java.awt.print.PrinterException; @@ -13,9 +13,10 @@ import org.diylc.common.EventType; import org.diylc.common.IPlugIn; import org.diylc.common.IPlugInPort; import org.diylc.common.PropertyWrapper; -import org.diylc.gui.DialogFactory; -import org.diylc.gui.editor.PropertyEditorDialog; import org.diylc.images.IconLoader; +import org.diylc.swing.ISwingUI; +import org.diylc.swing.gui.DialogFactory; +import org.diylc.swing.gui.editor.PropertyEditorDialog; import com.diyfever.gui.ButtonDialog; import com.diyfever.gui.IDrawingProvider; @@ -36,29 +37,29 @@ public class FileMenuPlugin implements IPlugIn { private ProjectDrawingProvider drawingProvider; private TraceMaskDrawingProvider traceMaskDrawingProvider; + public FileMenuPlugin(ISwingUI swingUI) { + swingUI.injectMenuAction(new NewAction(), FILE_TITLE); + swingUI.injectMenuAction(new OpenAction(), FILE_TITLE); + swingUI.injectMenuAction(new SaveAction(), FILE_TITLE); + swingUI.injectMenuAction(new SaveAsAction(), FILE_TITLE); + swingUI.injectMenuAction(null, FILE_TITLE); + swingUI.injectMenuAction(new ExportPDFAction(drawingProvider), FILE_TITLE); + swingUI.injectMenuAction(new ExportPNGAction(drawingProvider), FILE_TITLE); + swingUI.injectMenuAction(new PrintAction(drawingProvider), FILE_TITLE); + swingUI.injectSubmenu(TRACE_MASK_TITLE, IconLoader.TraceMask.getIcon(), FILE_TITLE); + swingUI.injectMenuAction(new ExportPDFAction(traceMaskDrawingProvider), TRACE_MASK_TITLE); + swingUI.injectMenuAction(new ExportPNGAction(traceMaskDrawingProvider), TRACE_MASK_TITLE); + swingUI.injectMenuAction(new PrintAction(traceMaskDrawingProvider), TRACE_MASK_TITLE); + swingUI.injectMenuAction(new CreateBomAction(), FILE_TITLE); + swingUI.injectMenuAction(null, FILE_TITLE); + swingUI.injectMenuAction(new ExitAction(), FILE_TITLE); + } + @Override public void connect(IPlugInPort plugInPort) { this.plugInPort = plugInPort; this.drawingProvider = new ProjectDrawingProvider(plugInPort, false); this.traceMaskDrawingProvider = new TraceMaskDrawingProvider(plugInPort); - - plugInPort.injectMenuAction(new NewAction(), FILE_TITLE); - plugInPort.injectMenuAction(new OpenAction(), FILE_TITLE); - plugInPort.injectMenuAction(new SaveAction(), FILE_TITLE); - plugInPort.injectMenuAction(new SaveAsAction(), FILE_TITLE); - plugInPort.injectMenuAction(null, FILE_TITLE); - plugInPort.injectMenuAction(new ExportPDFAction(drawingProvider), FILE_TITLE); - plugInPort.injectMenuAction(new ExportPNGAction(drawingProvider), FILE_TITLE); - plugInPort.injectMenuAction(new PrintAction(drawingProvider), FILE_TITLE); - plugInPort.injectSubmenu(TRACE_MASK_TITLE, IconLoader.TraceMask.getIcon(), FILE_TITLE); - plugInPort - .injectMenuAction(new ExportPDFAction(traceMaskDrawingProvider), TRACE_MASK_TITLE); - plugInPort - .injectMenuAction(new ExportPNGAction(traceMaskDrawingProvider), TRACE_MASK_TITLE); - plugInPort.injectMenuAction(new PrintAction(traceMaskDrawingProvider), TRACE_MASK_TITLE); - plugInPort.injectMenuAction(new CreateBomAction(), FILE_TITLE); - plugInPort.injectMenuAction(null, FILE_TITLE); - plugInPort.injectMenuAction(new ExitAction(), FILE_TITLE); } class NewAction extends AbstractAction { @@ -87,7 +88,8 @@ public class FileMenuPlugin implements IPlugIn { // Save default values. for (PropertyWrapper property : editor.getDefaultedProperties()) { if (property.getValue() != null) { - plugInPort.setProjectDefaultPropertyValue(property.getName(), property.getValue()); + plugInPort.setProjectDefaultPropertyValue(property.getName(), property + .getValue()); } } } diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/ProjectDrawingProvider.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/ProjectDrawingProvider.java similarity index 92% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/ProjectDrawingProvider.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/ProjectDrawingProvider.java index 89a83ffa..d703858a 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/ProjectDrawingProvider.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/ProjectDrawingProvider.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.file; +package org.diylc.swing.plugins.file; import java.awt.Dimension; import java.awt.Graphics; 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/swing/plugins/file/ProjectPreview.java similarity index 87% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/ProjectPreview.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/ProjectPreview.java index 1c17b674..784268a2 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/swing/plugins/file/ProjectPreview.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.file; +package org.diylc.swing.plugins.file; import java.awt.Color; import java.awt.Dimension; @@ -11,14 +11,11 @@ import java.io.File; import java.io.FileInputStream; import java.util.EnumSet; -import javax.swing.Action; -import javax.swing.Icon; import javax.swing.JComponent; import javax.swing.JFileChooser; import javax.swing.JLabel; import javax.swing.JPanel; -import org.diylc.common.BadPositionException; import org.diylc.common.DrawOption; import org.diylc.common.IPlugInPort; import org.diylc.core.IView; @@ -52,19 +49,6 @@ public class ProjectPreview extends JPanel implements PropertyChangeListener, IF setPreferredSize(new Dimension(140, 128)); presenter = new Presenter(new IView() { - @Override - public void addComponent(JComponent component, int position) - throws BadPositionException { - } - - @Override - public void addMenuAction(Action action, String menuName) { - } - - @Override - public void addSubmenu(String name, Icon icon, String parentMenuName) { - } - @Override public int showConfirmDialog(String message, String title, int optionType, int messageType) { diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/TraceMaskDrawingProvider.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/TraceMaskDrawingProvider.java similarity index 92% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/TraceMaskDrawingProvider.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/TraceMaskDrawingProvider.java index 661064d1..539ba0f0 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/TraceMaskDrawingProvider.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/TraceMaskDrawingProvider.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.file; +package org.diylc.swing.plugins.file; import java.awt.Dimension; import java.awt.Graphics; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/help/HelpMenuPlugin.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/help/HelpMenuPlugin.java similarity index 72% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/help/HelpMenuPlugin.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/help/HelpMenuPlugin.java index 77782bf9..9d9f3e99 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/help/HelpMenuPlugin.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/help/HelpMenuPlugin.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.help; +package org.diylc.swing.plugins.help; import java.awt.event.ActionEvent; import java.util.EnumSet; @@ -9,8 +9,9 @@ import javax.swing.Icon; import org.diylc.common.EventType; import org.diylc.common.IPlugIn; import org.diylc.common.IPlugInPort; -import org.diylc.gui.DialogFactory; 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.miscutils.Utils; @@ -34,24 +35,26 @@ public class HelpMenuPlugin implements IPlugIn { private IPlugInPort plugInPort; private AboutDialog aboutDialog; + public HelpMenuPlugin(ISwingUI swingUI) { + swingUI.injectMenuAction(new NavigateURLAction("User Manual", IconLoader.Manual.getIcon(), + MANUAL_URL), HELP_TITLE); + swingUI.injectMenuAction(new NavigateURLAction("FAQ", IconLoader.Faq.getIcon(), FAQ_URL), + HELP_TITLE); + swingUI.injectMenuAction(new NavigateURLAction("Component API", IconLoader.Component + .getIcon(), COMPONENT_URL), HELP_TITLE); + swingUI.injectMenuAction(new NavigateURLAction("Plugin API", IconLoader.Plugin.getIcon(), + PLUGIN_URL), HELP_TITLE); + swingUI.injectMenuAction(new NavigateURLAction("Submit a Bug", IconLoader.Bug.getIcon(), + BUG_URL), HELP_TITLE); + swingUI.injectMenuAction(null, HELP_TITLE); + swingUI.injectMenuAction(new NavigateURLAction("Donate", IconLoader.Donate.getIcon(), + DONATE_URL), HELP_TITLE); + swingUI.injectMenuAction(new AboutAction(), HELP_TITLE); + } + @Override public void connect(IPlugInPort plugInPort) { this.plugInPort = plugInPort; - - plugInPort.injectMenuAction(new NavigateURLAction("User Manual", IconLoader.Manual - .getIcon(), MANUAL_URL), HELP_TITLE); - plugInPort.injectMenuAction( - new NavigateURLAction("FAQ", IconLoader.Faq.getIcon(), FAQ_URL), HELP_TITLE); - plugInPort.injectMenuAction(new NavigateURLAction("Component API", IconLoader.Component - .getIcon(), COMPONENT_URL), HELP_TITLE); - plugInPort.injectMenuAction(new NavigateURLAction("Plugin API", - IconLoader.Plugin.getIcon(), PLUGIN_URL), HELP_TITLE); - plugInPort.injectMenuAction(new NavigateURLAction("Submit a Bug", IconLoader.Bug.getIcon(), - BUG_URL), HELP_TITLE); - plugInPort.injectMenuAction(null, HELP_TITLE); - plugInPort.injectMenuAction(new NavigateURLAction("Donate", IconLoader.Donate.getIcon(), - DONATE_URL), HELP_TITLE); - plugInPort.injectMenuAction(new AboutAction(), HELP_TITLE); } @Override diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/layers/LayersMenuPlugin.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/layers/LayersMenuPlugin.java similarity index 90% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/layers/LayersMenuPlugin.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/layers/LayersMenuPlugin.java index c0cf0f90..c8aa244f 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/layers/LayersMenuPlugin.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/layers/LayersMenuPlugin.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.layers; +package org.diylc.swing.plugins.layers; import java.awt.event.ActionEvent; import java.util.EnumSet; @@ -13,6 +13,7 @@ import org.diylc.common.EventType; import org.diylc.common.IPlugIn; import org.diylc.common.IPlugInPort; import org.diylc.core.IDIYComponent; +import org.diylc.swing.ISwingUI; public class LayersMenuPlugin implements IPlugIn { @@ -21,13 +22,7 @@ public class LayersMenuPlugin implements IPlugIn { private IPlugInPort plugInPort; private Map lockActionMap; - public LayersMenuPlugin() { - } - - @Override - public void connect(IPlugInPort plugInPort) { - this.plugInPort = plugInPort; - + public LayersMenuPlugin(ISwingUI swingUI) { lockActionMap = new HashMap(); for (Layer layer : Layer.values()) { final int zOrder = layer.getZOrder(); @@ -43,10 +38,15 @@ public class LayersMenuPlugin implements IPlugIn { }; action.putValue(IPlugInPort.CHECK_BOX_MENU_ITEM, true); lockActionMap.put(layer, action); - plugInPort.injectMenuAction(action, LOCK_LAYERS_TITLE); + swingUI.injectMenuAction(action, LOCK_LAYERS_TITLE); } } + @Override + public void connect(IPlugInPort plugInPort) { + this.plugInPort = plugInPort; + } + @Override public EnumSet getSubscribedEventTypes() { return EnumSet.of(EventType.LAYER_STATE_CHANGED); diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/OnlineManager.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/OnlineManager.java similarity index 78% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/OnlineManager.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/OnlineManager.java index 35f72faf..cd988389 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/OnlineManager.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/OnlineManager.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.online; +package org.diylc.swing.plugins.online; import java.awt.event.ActionEvent; import java.util.EnumSet; @@ -9,12 +9,12 @@ import javax.swing.SwingWorker; import org.diylc.common.EventType; import org.diylc.common.IPlugIn; import org.diylc.common.IPlugInPort; -import org.diylc.gui.DialogFactory; import org.diylc.images.IconLoader; -import org.diylc.plugins.online.presenter.LibraryPresenter; -import org.diylc.plugins.online.view.LoginDialog; -import org.diylc.plugins.online.view.NewUserDialog; -import org.diylc.plugins.online.view.UploadDialog; +import org.diylc.swing.gui.DialogFactory; +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; @@ -32,13 +32,13 @@ public class OnlineManager implements IPlugIn { initialize(); - plugInPort.injectMenuAction(new LibraryAction(), ONLINE_TITLE); - plugInPort.injectMenuAction(null, ONLINE_TITLE); - plugInPort.injectMenuAction(new LoginAction(), ONLINE_TITLE); - plugInPort.injectMenuAction(new CreateAccountAction(), ONLINE_TITLE); - plugInPort.injectMenuAction(null, ONLINE_TITLE); - plugInPort.injectMenuAction(new UploadAction(), ONLINE_TITLE); - plugInPort.injectMenuAction(new ManageProjectsAction(), ONLINE_TITLE); +// plugInPort.injectMenuAction(new LibraryAction(), ONLINE_TITLE); +// plugInPort.injectMenuAction(null, ONLINE_TITLE); +// plugInPort.injectMenuAction(new LoginAction(), ONLINE_TITLE); +// plugInPort.injectMenuAction(new CreateAccountAction(), ONLINE_TITLE); +// plugInPort.injectMenuAction(null, ONLINE_TITLE); +// plugInPort.injectMenuAction(new UploadAction(), ONLINE_TITLE); +// plugInPort.injectMenuAction(new ManageProjectsAction(), ONLINE_TITLE); } private void initialize() { diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/Test.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/Test.java similarity index 84% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/Test.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/Test.java index 53020c93..aee1e52b 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/Test.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/Test.java @@ -1,7 +1,7 @@ -package org.diylc.plugins.online; +package org.diylc.swing.plugins.online; import org.apache.log4j.BasicConfigurator; -import org.diylc.plugins.online.presenter.LibraryPresenter; +import org.diylc.swing.plugins.online.presenter.LibraryPresenter; public class Test { diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/model/ProjectEntity.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/model/ProjectEntity.java similarity index 93% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/model/ProjectEntity.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/model/ProjectEntity.java index d1690315..228307fa 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/model/ProjectEntity.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/model/ProjectEntity.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.online.model; +package org.diylc.swing.plugins.online.model; import java.awt.event.ActionEvent; import java.io.Serializable; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/presenter/AlreadyExistsException.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/presenter/AlreadyExistsException.java similarity index 66% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/presenter/AlreadyExistsException.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/presenter/AlreadyExistsException.java index eec16083..412fabea 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/presenter/AlreadyExistsException.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/presenter/AlreadyExistsException.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.online.presenter; +package org.diylc.swing.plugins.online.presenter; public class AlreadyExistsException extends Exception { diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/presenter/LibraryPresenter.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/presenter/LibraryPresenter.java similarity index 95% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/presenter/LibraryPresenter.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/presenter/LibraryPresenter.java index c65e9a9c..e6acd8a4 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/presenter/LibraryPresenter.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/presenter/LibraryPresenter.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.online.presenter; +package org.diylc.swing.plugins.online.presenter; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -10,7 +10,7 @@ import java.util.List; import java.util.Map; import org.apache.log4j.Logger; -import org.diylc.plugins.online.model.ProjectEntity; +import org.diylc.swing.plugins.online.model.ProjectEntity; public class LibraryPresenter { diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/presenter/MySqlDBManager.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/presenter/MySqlDBManager.java similarity index 94% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/presenter/MySqlDBManager.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/presenter/MySqlDBManager.java index 69178146..186ba407 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/presenter/MySqlDBManager.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/presenter/MySqlDBManager.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.online.presenter; +package org.diylc.swing.plugins.online.presenter; import java.sql.Connection; import java.sql.Driver; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/presenter/NotConnectedException.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/presenter/NotConnectedException.java similarity index 65% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/presenter/NotConnectedException.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/presenter/NotConnectedException.java index 4a4bc043..4752625e 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/presenter/NotConnectedException.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/presenter/NotConnectedException.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.online.presenter; +package org.diylc.swing.plugins.online.presenter; public class NotConnectedException extends Exception { diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/presenter/NotExistsException.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/presenter/NotExistsException.java similarity index 74% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/presenter/NotExistsException.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/presenter/NotExistsException.java index 37e7b388..169dcc37 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/presenter/NotExistsException.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/presenter/NotExistsException.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.online.presenter; +package org.diylc.swing.plugins.online.presenter; public class NotExistsException extends Exception { diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/presenter/NotLoggedInException.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/presenter/NotLoggedInException.java similarity index 65% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/presenter/NotLoggedInException.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/presenter/NotLoggedInException.java index c0cf201a..aba9b870 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/presenter/NotLoggedInException.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/presenter/NotLoggedInException.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.online.presenter; +package org.diylc.swing.plugins.online.presenter; public class NotLoggedInException extends Exception { diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/view/LibraryFrame.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/view/LibraryFrame.java similarity index 76% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/view/LibraryFrame.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/view/LibraryFrame.java index 856be855..89f2b839 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/view/LibraryFrame.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/view/LibraryFrame.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.online.view; +package org.diylc.swing.plugins.online.view; import javax.swing.JFrame; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/view/LoginDialog.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/view/LoginDialog.java similarity index 94% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/view/LoginDialog.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/view/LoginDialog.java index 4519dadf..12c56f1a 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/view/LoginDialog.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/view/LoginDialog.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.online.view; +package org.diylc.swing.plugins.online.view; import java.awt.Dimension; import java.awt.GridBagConstraints; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/view/NewUserDialog.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/view/NewUserDialog.java similarity index 94% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/view/NewUserDialog.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/view/NewUserDialog.java index d438d328..1f914071 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/view/NewUserDialog.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/view/NewUserDialog.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.online.view; +package org.diylc.swing.plugins.online.view; import java.awt.Dimension; import java.awt.GridBagConstraints; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/view/UploadDialog.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/view/UploadDialog.java similarity index 95% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/view/UploadDialog.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/view/UploadDialog.java index ad8a8a1f..5c1249c2 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/online/view/UploadDialog.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/view/UploadDialog.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.online.view; +package org.diylc.swing.plugins.online.view; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; 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/swing/plugins/statusbar/StatusBar.java similarity index 92% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/statusbar/StatusBar.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/statusbar/StatusBar.java index 977c4d5d..03c0273f 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/swing/plugins/statusbar/StatusBar.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.statusbar; +package org.diylc.swing.plugins.statusbar; import java.awt.BorderLayout; import java.awt.GridBagConstraints; @@ -24,6 +24,7 @@ import javax.swing.JPanel; import javax.swing.SwingUtilities; import javax.swing.UIManager; +import org.apache.log4j.Logger; import org.diylc.common.BadPositionException; import org.diylc.common.ComponentSelection; import org.diylc.common.ComponentType; @@ -32,6 +33,8 @@ import org.diylc.common.IPlugIn; import org.diylc.common.IPlugInPort; import org.diylc.core.IDIYComponent; import org.diylc.presenter.Presenter; +import org.diylc.swing.ISwingUI; +import org.diylc.swing.gui.MainFrame; import com.diyfever.gui.MemoryBar; import com.diyfever.gui.miscutils.ConfigurationManager; @@ -42,9 +45,11 @@ import com.diyfever.gui.update.UpdateLabel; public class StatusBar extends JPanel implements IPlugIn { private static final long serialVersionUID = 1L; + + private static final Logger LOG = Logger.getLogger(StatusBar.class); public static String UPDATE_URL = "http://www.diy-fever.com/update.xml"; - private static final Format sizeFormat = new DecimalFormat("0.00"); + private static final Format sizeFormat = new DecimalFormat("0.##"); private JComboBox zoomBox; private UpdateLabel updateLabel; @@ -61,11 +66,16 @@ public class StatusBar extends JPanel implements IPlugIn { private List selectedComponentNames; private List stuckComponentNames; - public StatusBar() { + public StatusBar(ISwingUI swingUI) { super(); - // setLayout(new FlowLayout(FlowLayout.TRAILING)); setLayout(new GridBagLayout()); + + try { + swingUI.injectGUIComponent(this, SwingUtilities.BOTTOM); + } catch (BadPositionException e) { + LOG.error("Could not install status bar", e); + } } private JComboBox getZoomBox() { @@ -164,13 +174,6 @@ public class StatusBar extends JPanel implements IPlugIn { this.plugInPort = plugInPort; layoutComponents(); - - try { - plugInPort.injectGUIComponent(this, SwingUtilities.BOTTOM); - } catch (BadPositionException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } } @Override 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/swing/plugins/toolbox/ComponentButton.java similarity index 94% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/toolbox/ComponentButton.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/toolbox/ComponentButton.java index 9c553e4e..84b4b73f 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/swing/plugins/toolbox/ComponentButton.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.toolbox; +package org.diylc.swing.plugins.toolbox; import java.awt.Insets; import java.awt.dnd.DnDConstants; 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/swing/plugins/toolbox/ComponentTabbedPane.java similarity index 96% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/toolbox/ComponentTabbedPane.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java index d50838d3..8a22a23c 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/swing/plugins/toolbox/ComponentTabbedPane.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.toolbox; +package org.diylc.swing.plugins.toolbox; import java.awt.BorderLayout; import java.awt.Component; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/toolbox/ToolBox.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/toolbox/ToolBox.java similarity index 54% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/toolbox/ToolBox.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/toolbox/ToolBox.java index dd11d727..2aca3ab9 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/toolbox/ToolBox.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/toolbox/ToolBox.java @@ -1,24 +1,34 @@ -package org.diylc.plugins.toolbox; +package org.diylc.swing.plugins.toolbox; import java.util.EnumSet; import javax.swing.SwingConstants; +import org.apache.log4j.Logger; import org.diylc.common.BadPositionException; import org.diylc.common.EventType; import org.diylc.common.IPlugIn; import org.diylc.common.IPlugInPort; +import org.diylc.swing.ISwingUI; +import org.diylc.swing.plugins.statusbar.StatusBar; public class ToolBox implements IPlugIn { + + private static final Logger LOG = Logger.getLogger(StatusBar.class); + + private ISwingUI swingUI; + + public ToolBox(ISwingUI swingUI) { + this.swingUI = swingUI; + } @Override public void connect(IPlugInPort plugInPort) { try { - plugInPort.injectGUIComponent(new ComponentTabbedPane(plugInPort), SwingConstants.TOP); + swingUI.injectGUIComponent(new ComponentTabbedPane(plugInPort), SwingConstants.TOP); } catch (BadPositionException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + LOG.error("Could not install the toolbox", e); } } diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/toolbox/ToolboxGestureListener.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/toolbox/ToolboxGestureListener.java similarity index 91% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/toolbox/ToolboxGestureListener.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/toolbox/ToolboxGestureListener.java index 882b69ea..35e08a1d 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/toolbox/ToolboxGestureListener.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/toolbox/ToolboxGestureListener.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.toolbox; +package org.diylc.swing.plugins.toolbox; import java.awt.Cursor; import java.awt.datatransfer.StringSelection; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/toolbox/ToolboxSourceListener.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/toolbox/ToolboxSourceListener.java similarity index 91% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/toolbox/ToolboxSourceListener.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/toolbox/ToolboxSourceListener.java index 151c8fe3..2dd25419 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/toolbox/ToolboxSourceListener.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/toolbox/ToolboxSourceListener.java @@ -1,4 +1,4 @@ -package org.diylc.plugins.toolbox; +package org.diylc.swing.plugins.toolbox; import java.awt.dnd.DragSourceDragEvent; import java.awt.dnd.DragSourceDropEvent; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/test/org/diylc/ProjectSearch.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/test/org/diylc/ProjectSearch.java index 820d0271..bc91e7fc 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/test/org/diylc/ProjectSearch.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/test/org/diylc/ProjectSearch.java @@ -2,7 +2,7 @@ package org.diylc; import java.util.List; -import org.diylc.plugins.online.model.ProjectEntity; +import org.diylc.swing.plugins.online.model.ProjectEntity; import com.diyfever.httpproxy.ParamName; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/test/org/diylc/TableTest.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/test/org/diylc/TableTest.java index 2381e992..9f8d01ee 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/test/org/diylc/TableTest.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/test/org/diylc/TableTest.java @@ -9,7 +9,7 @@ import javax.swing.JFrame; import javax.swing.JScrollPane; import org.apache.log4j.BasicConfigurator; -import org.diylc.plugins.online.model.ProjectEntity; +import org.diylc.swing.plugins.online.model.ProjectEntity; import com.diyfever.gui.objecttable.IActionProcessor; import com.diyfever.gui.objecttable.ObjectListTable; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/test/org/diylc/Test.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/test/org/diylc/Test.java index bcecdcf5..390f9b4f 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/test/org/diylc/Test.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/test/org/diylc/Test.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.log4j.BasicConfigurator; -import org.diylc.plugins.online.model.ProjectEntity; +import org.diylc.swing.plugins.online.model.ProjectEntity; import com.diyfever.httpproxy.ParamName; import com.diyfever.httpproxy.PhpFlatProxy; 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 c42d53e9..7fb75f79 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 @@ -9,8 +9,8 @@ import org.diylc.components.MockDIYComponent; import org.diylc.core.IDIYComponent; 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.diylc.swing.plugins.file.BomEntry; +import org.diylc.swing.plugins.file.BomMaker; import org.junit.Test; public class BomMakerTest {