diff --git a/designer-base/src/main/java/com/fr/design/constants/UIConstants.java b/designer-base/src/main/java/com/fr/design/constants/UIConstants.java index 645a31906d..da05a79dd5 100644 --- a/designer-base/src/main/java/com/fr/design/constants/UIConstants.java +++ b/designer-base/src/main/java/com/fr/design/constants/UIConstants.java @@ -55,7 +55,7 @@ public interface UIConstants { * Cell default cursor. */ public static final Cursor CELL_DEFAULT_CURSOR = Toolkit.getDefaultToolkit().createCustomCursor( - SVGLoader.load("/com/fr/design/standard/cell_default_normal.svg"), + IOUtils.readImage("/com/fr/base/images/cell/cursor/cell_default.png"), new Point(16, 16), "CellDefaultCursor"); public static final Cursor DRAW_CURSOR = Toolkit.getDefaultToolkit().createCustomCursor( IOUtils.readImage("/com/fr/base/images/cell/cursor/cursor_draw.png"), diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/ServerTableDataWrapper.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/ServerTableDataWrapper.java index 839275fa41..cf66d9700e 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/ServerTableDataWrapper.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/ServerTableDataWrapper.java @@ -27,7 +27,7 @@ public final class ServerTableDataWrapper extends AbstractTableDataWrapper { public Icon getIcon() { if (tabledata instanceof DBTableData) { if (StringUtils.isBlank(((DBTableData) tabledata).getQuery())) { - return new WarningIcon(BaseUtils.readImage("/com/fr/design/images/gui/warning.png")); + return new WarningIcon(SVGLoader.load("/com/fr/design/standard/server_database_normal.svg")); } else { return IconUtils.readIcon("/com/fr/design/standard/server_database"); diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java index 749f2b3ae4..8345bde944 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java @@ -59,7 +59,7 @@ public abstract class TableDataFactory { defaultMap.put(ClassTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/class_table_data_normal.svg", ClassTableData.class, ClassTableDataPane.class)); defaultMap.put(EmbeddedTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/data_table_normal.svg", EmbeddedTableData.class, EmbeddedTableDataPane.class)); defaultMap.put(DecoratedTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/multi_normal.svg", DecoratedTableData.class, DecoratedTableDataPane.class)); - defaultMap.put(StoreProcedure.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/images/data/store_procedure.png", StoreProcedure.class, ProcedureDataPane.class)); + defaultMap.put(StoreProcedure.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/store_procedure_normal.svg", StoreProcedure.class, ProcedureDataPane.class)); defaultMap.put(MultiTDTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/multi_normal.svg", MultiTDTableData.class, MultiTDTableDataPane.class)); defaultMap.put(FileTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/file_normal.svg", FileTableData.class, FileTableDataPane.class)); defaultMap.put(RecursionTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/tree_normal.svg", RecursionTableData.class, TreeTableDataPane.class)); diff --git a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIResizableContainer.java b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIResizableContainer.java index 0cd17cd002..8e562cc3ce 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIResizableContainer.java +++ b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIResizableContainer.java @@ -410,13 +410,11 @@ public class UIResizableContainer extends JPanel { Image upButton = (upModel == UIConstants.MODEL_NORMAL ? UIConstants.DRAG_UP_NORMAL : UIConstants.DRAG_UP_PRESS); Image downButton = (downModel == UIConstants.MODEL_NORMAL ? UIConstants.DRAG_DOWN_NORMAL : UIConstants.DRAG_DOWN_PRESS); - int width = getWidth(); - int height = getHeight(); g.drawImage(UIConstants.DRAG_BAR_LIGHT, 0, 0, getWidth(), getHeight(), null); SvgPaintUtils.beforePaint((Graphics2D) g); - g.drawImage(UIConstants.DRAG_LINE, (getWidth() - toolPaneHeight) / 2, 3, this); - g.drawImage(upButton, ARROW_MARGIN, 1, this); - g.drawImage(downButton, getWidth() - toolPaneHeight - ARROW_MARGIN, 1, this); + g.drawImage(UIConstants.DRAG_LINE, (getWidth() - toolPaneHeight) / 2, 3, null); + g.drawImage(upButton, ARROW_MARGIN, 1, null); + g.drawImage(downButton, getWidth() - toolPaneHeight - ARROW_MARGIN, 1, null); SvgPaintUtils.afterPaint((Graphics2D) g); } } diff --git a/designer-base/src/main/java/com/fr/design/icon/WarningIcon.java b/designer-base/src/main/java/com/fr/design/icon/WarningIcon.java index 6d28365722..08d5b5a55a 100644 --- a/designer-base/src/main/java/com/fr/design/icon/WarningIcon.java +++ b/designer-base/src/main/java/com/fr/design/icon/WarningIcon.java @@ -1,6 +1,7 @@ package com.fr.design.icon; -import com.fr.base.BaseUtils; +import com.fr.base.svg.SVGLoader; +import com.fr.design.utils.SvgPaintUtils; import com.fr.log.FineLoggerFactory; import javax.swing.GrayFilter; @@ -15,10 +16,10 @@ import java.awt.image.ImageObserver; * @since 2012-3-28下午10:20:29 */ public class WarningIcon extends ImageIcon { - protected final static Component component = new Component() { + protected final static Component COMPONENT = new Component() { }; - protected final static MediaTracker tracker = new MediaTracker(component); - private final static Image warnighImage = BaseUtils.readImage("/com/fr/design/images/gui/warning.png"); + protected final static MediaTracker TRACKER = new MediaTracker(COMPONENT); + private final static Image WARNING_IMAGE = SVGLoader.load("/com/fr/design/standard/warning.svg"); private Image mainImage = null; private ImageObserver imageObserver; @@ -35,12 +36,14 @@ public class WarningIcon extends ImageIcon { @Override public synchronized void paintIcon(Component c, Graphics g, int x, int y) { + SvgPaintUtils.beforePaint((Graphics2D) g); if (mainImage != null) { g.drawImage(mainImage, x, y, c); } - if (warnighImage != null) { - g.drawImage(warnighImage, x, y, c); + if (WARNING_IMAGE != null) { + g.drawImage(WARNING_IMAGE, x, y, c); } + SvgPaintUtils.afterPaint((Graphics2D) g); } /** @@ -50,17 +53,17 @@ public class WarningIcon extends ImageIcon { * the image */ protected void loadImage(Image image) { - synchronized (tracker) { - tracker.addImage(image, 0); + synchronized (TRACKER) { + TRACKER.addImage(image, 0); try { - tracker.waitForID(0, 0); + TRACKER.waitForID(0, 0); } catch (InterruptedException e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); Thread.currentThread().interrupt(); } - tracker.statusID(0, false); - tracker.removeImage(image, 0); + TRACKER.statusID(0, false); + TRACKER.removeImage(image, 0); width = image.getWidth(imageObserver); height = image.getHeight(imageObserver); @@ -101,6 +104,6 @@ public class WarningIcon extends ImageIcon { } { - loadImage(warnighImage); + loadImage(WARNING_IMAGE); } } \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/standard/bias/bias_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/bias/bias_normal.svg index e20ec42eb0..92af8e076a 100644 --- a/designer-base/src/main/resources/com/fr/design/standard/bias/bias_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/standard/bias/bias_normal.svg @@ -2,6 +2,6 @@ icon_斜线_normal - + diff --git a/designer-base/src/main/resources/com/fr/design/standard/warning.svg b/designer-base/src/main/resources/com/fr/design/standard/warning.svg new file mode 100644 index 0000000000..8b5d47014b --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/warning.svg @@ -0,0 +1,9 @@ + + + + + + + + +