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 b47b8d94f9..0a7b0a338c 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 @@ -4,7 +4,6 @@ package com.fr.design.constants; import com.fine.theme.icon.LazyIcon; -import com.fr.base.svg.SVGLoader; import com.fr.general.IOUtils; import com.fr.stable.Constants; import com.fr.stable.StringUtils; @@ -15,7 +14,6 @@ import javax.swing.border.Border; import java.awt.BasicStroke; import java.awt.Color; import java.awt.Cursor; -import java.awt.Image; import java.awt.Point; import java.awt.Stroke; import java.awt.Toolkit; @@ -26,28 +24,14 @@ import java.awt.image.BufferedImage; */ public interface UIConstants { - public static final Icon BLACK_ICON = IOUtils.readIcon("/com/fr/base/images/cell/blank.gif"); public static final String EMPTY_ICON = StringUtils.EMPTY; - public static final Image APPFIT_V0 = IOUtils.readImage("/com/fr/design/images/dialog/appfit/V0.png"); - public static final Image APPFIT_V1 = IOUtils.readImage("/com/fr/design/images/dialog/appfit/V1.png"); - public static final Image APPFIT_V2 = IOUtils.readImage("/com/fr/design/images/dialog/appfit/V2.png"); - public static final Image APPFIT_V3 = IOUtils.readImage("/com/fr/design/images/dialog/appfit/V3.png"); - public static final Image APPFIT_V4 = IOUtils.readImage("/com/fr/design/images/dialog/appfit/V4.png"); - public static final Image APPFIT_H0 = IOUtils.readImage("/com/fr/design/images/dialog/appfit/H0.png"); - public static final Image APPFIT_H1 = IOUtils.readImage("/com/fr/design/images/dialog/appfit/H1.png"); - public static final Image APPFIT_H2 = IOUtils.readImage("/com/fr/design/images/dialog/appfit/H2.png"); - public static final Image APPFIT_H3 = IOUtils.readImage("/com/fr/design/images/dialog/appfit/H3.png"); - public static final Image APPFIT_H4 = IOUtils.readImage("/com/fr/design/images/dialog/appfit/H4.png"); - public static final Border CELL_ATTR_ZEROBORDER = BorderFactory.createEmptyBorder(0, 1, 0, 0); public static final Border CELL_ATTR_EMPTYBORDER = BorderFactory.createEmptyBorder(0, 10, 0, 0); public static final Border CELL_ATTR_PRESENTBORDER = BorderFactory.createEmptyBorder(0, 5, 0, 0); public static final Border CELL_ATTR_NORMALBORDER = BorderFactory.createEmptyBorder(0, 10, 0, 15); - public static final int SIZE = 17; - public static final int GAP_NORMAL = 10; // 10px /** @@ -151,12 +135,7 @@ public interface UIConstants { public static final Color CHECK_BOX_TIP_FONT_COLOR = new Color(51, 51, 52, (int)Math.round(0.5 * 255)); public static final BufferedImage DRAG_BAR = IOUtils.readImage("com/fr/design/images/control/bar.png"); - public static final Image ARROW_NORTH = SVGLoader.load("/com/fr/design/standard/arrowlinear/up_arrow.svg"); - public static final Image ARROW_SOUTH = SVGLoader.load("/com/fr/design/standard/arrowlinear/down_arrow.svg"); - public static final Image ARROW_EAST = SVGLoader.load("/com/fr/design/standard/arrowlinear/east_arrow.svg"); - public static final Image ARROW_WEST = SVGLoader.load("/com/fr/design/standard/arrowlinear/west_arrow.svg"); public static final BufferedImage DRAG_DOT = IOUtils.readImage("com/fr/design/images/control/dot.png"); - public static final BufferedImage WATERMARK_BACKGROUND = IOUtils.readImage("/com/fr/design/images/dialog/watermark/" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_WaterMark_Background_Icon_File_Name")); public static final int MODEL_NORMAL = 0; public static final int MODEL_PRESS = 1; diff --git a/designer-base/src/main/java/com/fr/design/editlock/EditLockUtils.java b/designer-base/src/main/java/com/fr/design/editlock/EditLockUtils.java index c988f2a711..160a07b939 100644 --- a/designer-base/src/main/java/com/fr/design/editlock/EditLockUtils.java +++ b/designer-base/src/main/java/com/fr/design/editlock/EditLockUtils.java @@ -29,11 +29,6 @@ public class EditLockUtils { */ public static final Icon CONNECTION_LOCKED_ICON = new LazyIcon("connection_locked"); - /** - * 小锁图片 - */ - public static final @Nullable Image LOCKED_IMAGE = SVGLoader.load("/com/fr/design/images/m_web/locked_normal.svg"); - /** * 提示弹窗中的提示标志 */ diff --git a/designer-base/src/main/java/com/fr/design/gui/imenu/UICheckBoxMenuItem.java b/designer-base/src/main/java/com/fr/design/gui/imenu/UICheckBoxMenuItem.java index 376338358d..7fb3c9c3c3 100644 --- a/designer-base/src/main/java/com/fr/design/gui/imenu/UICheckBoxMenuItem.java +++ b/designer-base/src/main/java/com/fr/design/gui/imenu/UICheckBoxMenuItem.java @@ -1,7 +1,7 @@ package com.fr.design.gui.imenu; import com.fine.theme.icon.LazyIcon; -import com.fr.design.constants.UIConstants; +import com.fr.general.IOUtils; public class UICheckBoxMenuItem extends UIMenuItem { @@ -22,7 +22,7 @@ public class UICheckBoxMenuItem extends UIMenuItem { if (this.isSelected()) { setIcon(new LazyIcon("checkbox_checked")); } else { - setIcon(UIConstants.BLACK_ICON); + setIcon(IOUtils.readIcon("/com/fr/base/images/cell/blank.gif")); } } diff --git a/designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItemUI.java b/designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItemUI.java deleted file mode 100644 index 7601b70ad1..0000000000 --- a/designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItemUI.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.fr.design.gui.imenu; - -import com.fr.design.editlock.EditLockUtils; - -import javax.swing.JMenuItem; -import java.awt.Graphics; -import java.awt.Rectangle; - -/** - * @author Yvan - * @version 10.0 - * Created by Yvan on 2021/1/20 - */ -public class UILockMenuItemUI extends UIMenuItemUI{ - - @Override - protected void paintText(Graphics g, JMenuItem menuItem, Rectangle textRect, String text) { - super.paintText(g, menuItem, textRect, text); - // 除了绘制text之外，还需要画一下锁定图标 - UILockMenuItem lockMenuItem = (UILockMenuItem) menuItem; -// if (EditLockUtils.isLocked(lockMenuItem.getLockItem())) { - int width = menuItem.getWidth(); - int height = menuItem.getHeight(); - g.drawImage(EditLockUtils.LOCKED_IMAGE, (int) Math.round(width * 0.9), (int) Math.round(height * 0.1), 16, 16, null); -// } - - } -} diff --git a/designer-base/src/main/java/com/fr/design/report/WatermarkPreviewPane.java b/designer-base/src/main/java/com/fr/design/report/WatermarkPreviewPane.java index 8e9eb853e7..2473a65273 100644 --- a/designer-base/src/main/java/com/fr/design/report/WatermarkPreviewPane.java +++ b/designer-base/src/main/java/com/fr/design/report/WatermarkPreviewPane.java @@ -1,17 +1,21 @@ package com.fr.design.report; import com.fr.base.iofile.attr.WatermarkAttr; -import com.fr.design.constants.UIConstants; +import com.fr.general.IOUtils; import com.fr.page.WatermarkPainter; import javax.swing.JPanel; import java.awt.Graphics; import java.awt.Graphics2D; +import java.awt.image.BufferedImage; /** * Created by plough on 2018/5/15. */ public class WatermarkPreviewPane extends JPanel { + + public static final BufferedImage WATERMARK_BACKGROUND = IOUtils.readImage("/com/fr/design/images/dialog/watermark/" + + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_WaterMark_Background_Icon_File_Name")); private WatermarkAttr watermark; public WatermarkPreviewPane() { @@ -31,7 +35,7 @@ public class WatermarkPreviewPane extends JPanel { public void paint(Graphics g) { super.paint(g); Graphics2D g2d = (Graphics2D)g; - g2d.drawImage(UIConstants.WATERMARK_BACKGROUND, 0, 0, this.getWidth(), this.getHeight(), null); + g2d.drawImage(WATERMARK_BACKGROUND, 0, 0, this.getWidth(), this.getHeight(), null); WatermarkPainter painter = WatermarkPainter.createPainter(watermark); painter.paint(g2d, this.getWidth(), this.getHeight()); } diff --git a/designer-realize/src/main/java/com/fr/design/cell/bar/DynamicScrollBarUI.java b/designer-realize/src/main/java/com/fr/design/cell/bar/DynamicScrollBarUI.java deleted file mode 100644 index 1679839cab..0000000000 --- a/designer-realize/src/main/java/com/fr/design/cell/bar/DynamicScrollBarUI.java +++ /dev/null @@ -1,221 +0,0 @@ -package com.fr.design.cell.bar; - -import com.fr.design.gui.iscrollbar.UISBChooser; - -import javax.swing.*; -import javax.swing.plaf.basic.BasicScrollBarUI; -import java.awt.*; -import java.awt.event.MouseEvent; - -/** - * Created by IntelliJ IDEA. - * Author : daisy - * Version: 6.5.6 - * Date: 13-12-30 - * Time: 下午2:28 - */ -public class DynamicScrollBarUI extends BasicScrollBarUI { - - - private boolean isRollover = false; - //是否 - private boolean wasRollover = false; - - - public DynamicScrollBarUI() { - - } - - /** - * 是否可见 - * @return 可见返回true - */ - public boolean isThumbVisible() { - if (scrollbar.getOrientation() == JScrollBar.VERTICAL) { - return getThumbBounds().height > 0; - } else { - return getThumbBounds().width > 0; - } - } - - public void paintThumb(Graphics g, JComponent c, Rectangle t) { -// super.paintThumb(g,c,t); - paintXP(g, t); - } - - private void paintXP(Graphics g, Rectangle t) { - Color c = null; - if (isDragging && isRollover) { - c = ScrollBarUIConstant.PRESS_SCROLL_BAR_COLOR; - } else if (isRollover) { - c = ScrollBarUIConstant.ROLL_OVER_SCROLL_BAR_COLOR; - } else { - c = ScrollBarUIConstant.NORMAL_SCROLL_BAR_COLOR; - } - - g.setColor(c); - - int xs = t.x + 1; - int ys = t.y + 1; - int x2 = t.x + t.width - 1; - int y2 = t.y + t.height - 1; - - paintScrollBar(g, xs, ys, x2, y2, t); - - // draw Grip -// if (t.height < 11) { -// return; -// } -// -// if (scrollbar.getOrientation() == JScrollBar.VERTICAL) { -// drawVertical(t, y2, g, c); -// } else { -// drawHrizontal(t, x2, g, c); -// } - } - - - private void drawHrizontal(Rectangle t, int x2, Graphics g, Color c) { - int x1 = t.x + (t.width) / 2 - 4; - x2 = Math.min(x1 + 8, t.x + t.width - 5); - - int x = x1 + 1; - // we take only saturation & brightness and apply them - // to the background color (normal/rollover/pressed) - g.setColor(UISBChooser.getAdjustedColor(c, 0, 71)); - while (x < x2) { - g.drawLine(x, 5, x, 11); - x += 2; - } - - x = x1; - g.setColor(UISBChooser.getAdjustedColor(c, 0, -13)); - while (x < x2) { - g.drawLine(x, 6, x, 12); - x += 2; - } - } - - private void drawVertical(Rectangle t, int y2, Graphics g, Color c) { - int y1 = t.y + (t.height) / 2 - 4; - y2 = Math.min(y1 + 8, t.y + t.height - 5); - - int y = y1; - // we take only saturation & brightness and apply them - // to the background color (normal/rollover/pressed) - g.setColor(UISBChooser.getAdjustedColor(c, 0, 71)); - while (y < y2) { - g.drawLine(5, y, 11, y); - y += 2; - } - - y = y1 + 1; - g.setColor(UISBChooser.getAdjustedColor(c, 0, -13)); - while (y < y2) { - g.drawLine(6, y, 12, y); - y += 2; - } - } - - private void paintScrollBar(Graphics g, int xs, int ys, int x2, int y2, Rectangle t) { - switch (scrollbar.getOrientation()) { - //harry: 垂直滚动条和水平滚动条的画法分开。 - case JScrollBar.VERTICAL: - Graphics2D g2 = (Graphics2D) g; - GradientPaint scrollBarBg = null; - if (isRollover) { - scrollBarBg = new GradientPaint(xs, ys, ScrollBarUIConstant.ROLL_OVER_SCROLL_BAR_COLOR, x2, ys, ScrollBarUIConstant.ROLL_OVER_SCROLL_BAR_COLOR); - } else { - scrollBarBg = new GradientPaint(xs, ys, ScrollBarUIConstant.NORMAL_SCROLL_BAR_COLOR, x2, ys, ScrollBarUIConstant.NORMAL_SCROLL_BAR_COLOR); - } - g2.setPaint(scrollBarBg); - g2.fillRoundRect(xs, ys, t.width - 2, t.height - 2, 0, 0); - break; - case JScrollBar.HORIZONTAL: - Graphics2D g2H = (Graphics2D) g; - if (isRollover) { - scrollBarBg = new GradientPaint(xs, ys, ScrollBarUIConstant.ROLL_OVER_SCROLL_BAR_COLOR, xs, y2, ScrollBarUIConstant.ROLL_OVER_SCROLL_BAR_COLOR); - } else { - scrollBarBg = new GradientPaint(xs, ys, ScrollBarUIConstant.NORMAL_SCROLL_BAR_COLOR, xs, y2, ScrollBarUIConstant.NORMAL_SCROLL_BAR_COLOR); - } - g2H.setPaint(scrollBarBg); - g2H.fillRoundRect(xs, ys, t.width - 2, t.height - 2, 0, 0); - break; - } - } - - - protected JButton createDecreaseButton(int orientation) { - return new DynamicScrollButton(orientation, this); - } - - /** - * Creates the increase button of the scrollbar. - * - * @param orientation The button's orientation. - * @return The created button. - */ - protected JButton createIncreaseButton(int orientation) { - return new DynamicScrollButton(orientation, this); - } - - protected TrackListener createTrackListener() { - return new ScrollBarTrackListener(); - } - - - private class ScrollBarTrackListener extends BasicScrollBarUI.TrackListener { - public void mouseReleased(MouseEvent e) { - super.mouseReleased(e); - scrollbar.repaint(); - } - - public void mousePressed(MouseEvent e) { - super.mousePressed(e); - scrollbar.repaint(); - } - - public void mouseEntered(MouseEvent e) { - isRollover = false; - wasRollover = false; - if (getThumbBounds().contains(e.getPoint())) { - isRollover = true; - wasRollover = isRollover; - scrollbar.repaint(); - } - } - - public void mouseExited(MouseEvent e) { - isRollover = false; - if (isRollover != wasRollover) { - wasRollover = isRollover; - scrollbar.repaint(); - } - } - - public void mouseDragged(MouseEvent e) { - if (getThumbBounds().contains(e.getPoint())) { - isDragging = true; - } - super.mouseDragged(e); - } - - public void mouseMoved(MouseEvent e) { - if (getThumbBounds().contains(e.getPoint())) { - isRollover = true; - if (isRollover != wasRollover) { - scrollbar.repaint(); - wasRollover = isRollover; - } - } else { - isRollover = false; - if (isRollover != wasRollover) { - scrollbar.repaint(); - wasRollover = isRollover; - } - } - } - } - - -} \ No newline at end of file diff --git a/designer-realize/src/main/java/com/fr/design/cell/bar/DynamicScrollButton.java b/designer-realize/src/main/java/com/fr/design/cell/bar/DynamicScrollButton.java deleted file mode 100644 index cc0ab91809..0000000000 --- a/designer-realize/src/main/java/com/fr/design/cell/bar/DynamicScrollButton.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.fr.design.cell.bar; - -import com.fr.design.constants.UIConstants; -import com.fr.design.utils.SvgDrawUtils; -import com.fr.general.ComparatorUtils; - -import javax.swing.SwingConstants; -import javax.swing.plaf.basic.BasicArrowButton; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.GradientPaint; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Image; -import java.awt.Insets; -import java.awt.image.BufferedImage; -import java.util.HashMap; - -/** - * Created by IntelliJ IDEA. - * Author : daisy - * Version: 6.5.6 - * Date: 13-12-30 - * Time: 下午3:22 - */ -public class DynamicScrollButton extends BasicArrowButton { - - - private DynamicScrollBarUI scrollbarUI; - - - static HashMap cache = new HashMap(); - - private Dimension buttonSize = new Dimension(17, 17); - - public DynamicScrollButton(int direction, DynamicScrollBarUI scrollbarUI) { - super(direction); - - this.scrollbarUI = scrollbarUI; - setBorder(null); - setRolloverEnabled(true); - setMargin(new Insets(0, 0, 0, 0)); - setSize(buttonSize); - } - - public void paint(Graphics g) { - Color c = null; - - if (!scrollbarUI.isThumbVisible()) { - c = ScrollBarUIConstant.DISABLE_SCROLL_BAR_COLOR; - } else if (getModel().isPressed()) { - c = ScrollBarUIConstant.PRESS_SCROLL_BAR_COLOR; - } else if (getModel().isRollover()) { - c = ScrollBarUIConstant.ROLL_OVER_SCROLL_BAR_COLOR; - } else { - c = ScrollBarUIConstant.NORMAL_SCROLL_BAR_COLOR; - } - - g.setColor(c); - paintButton(g, getSize(), c); - if (!scrollbarUI.isThumbVisible()) { - g.setColor(ScrollBarUIConstant.ARROW_DISABLED_COLOR); - } else { - g.setColor(ScrollBarUIConstant.SCROLL_ARROW_COLOR); - } - - paintArrow(g, getSize()); - } - - - private void paintArrow(Graphics g, Dimension size) { - SvgDrawUtils.beforeDraw((Graphics2D) g); - switch (direction) { - case SwingConstants.NORTH: - g.drawImage(UIConstants.ARROW_NORTH, 0, 0, this); - break; - case SwingConstants.SOUTH: - g.drawImage(UIConstants.ARROW_SOUTH, 0, 0, this); - break; - case SwingConstants.EAST: - g.drawImage(UIConstants.ARROW_EAST, 0, 0, this); - break; - case SwingConstants.WEST: - g.drawImage(UIConstants.ARROW_WEST, 0, 0, this); - break; - } - SvgDrawUtils.afterDraw((Graphics2D) g); - } - - - private void paintButton(Graphics g, Dimension size, Color c) { - boolean enabled = scrollbarUI.isThumbVisible(); - boolean pressed = getModel().isPressed(); - boolean rollover = getModel().isRollover(); - ScrollButtonKey key = new ScrollButtonKey( - (direction == NORTH || direction == SOUTH), - c, pressed, enabled, rollover); - Object value = cache.get(key); - if (value != null) { - // image was cached - paint image and return - g.drawImage((Image) value, 0, 0, this); - return; - } - Image img = new BufferedImage(17, 17, BufferedImage.TYPE_INT_ARGB); - Graphics imgGraphics = img.getGraphics(); - switch (direction) { - case EAST: - case WEST: - case NORTH: - case SOUTH: - Color a = ScrollBarUIConstant.SCROLL_BORDER_COLOR; - Graphics2D g2 = (Graphics2D) imgGraphics; - GradientPaint scrollBarBg = null; - if (!scrollbarUI.isThumbVisible()) { - scrollBarBg = new GradientPaint(1, 1, ScrollBarUIConstant.NORMAL_SCROLL_BUTTON_COLOR, 1, 16, ScrollBarUIConstant.NORMAL_SCROLL_BUTTON_COLOR); - } else if (getModel().isPressed()) { - scrollBarBg = new GradientPaint(1, 1, ScrollBarUIConstant.PRESSED_SCROLL_BUTTON_COLOR, 1, 16, ScrollBarUIConstant.PRESSED_SCROLL_BUTTON_COLOR); - } else if (getModel().isRollover()) { - scrollBarBg = new GradientPaint(1, 1, ScrollBarUIConstant.PRESSED_SCROLL_BUTTON_COLOR, 1, 16, ScrollBarUIConstant.PRESSED_SCROLL_BUTTON_COLOR); - } else { - scrollBarBg = new GradientPaint(1, 1, ScrollBarUIConstant.NORMAL_SCROLL_BUTTON_COLOR, 1, 16, ScrollBarUIConstant.NORMAL_SCROLL_BUTTON_COLOR); - } - //GradientPaint scrollBarHight = new GradientPaint(0, 0, new Color(1.0f, 1.0f, 1.0f, 0.5f), 0, 7, new Color(1.0f, 1.0f, 1.0f, 0.2f)); - g2.setPaint(scrollBarBg); - g2.fillRoundRect(1, 1, 16, 16, 0, 0); - break; - } - // dispose of image graphics - imgGraphics.dispose(); - // draw the image - g.drawImage(img, 0, 0, this); - // add the image to the cache - cache.put(key, img); - } - - static class ScrollButtonKey { - - private boolean vertical; - private Color c; - private boolean pressed; - private boolean enabled; - private boolean rollover; - - ScrollButtonKey(boolean vertical, Color c, - boolean pressed, boolean enabled, boolean rollover) { - this.vertical = vertical; - this.c = c; - this.pressed = pressed; - this.enabled = enabled; - this.rollover = rollover; - } - - public boolean equals(Object o) { - if (o == null) { - return false; - } - if (!(o instanceof ScrollButtonKey)) { - return false; - } - - ScrollButtonKey other = (ScrollButtonKey) o; - - return vertical == other.vertical && - pressed == other.pressed && - enabled == other.enabled && - rollover == other.rollover && - ComparatorUtils.equals(c, other.c); - - } - - public int hashCode() { - return c.hashCode() * - (pressed ? 1 : 2) * - (enabled ? 4 : 8) * - (rollover ? 16 : 32) * - (vertical ? 64 : 128); - } - } - -} \ No newline at end of file diff --git a/designer-realize/src/main/java/com/fr/design/report/mobile/AppFitPreviewPane.java b/designer-realize/src/main/java/com/fr/design/report/mobile/AppFitPreviewPane.java index 6f720fd919..5002ebbd73 100644 --- a/designer-realize/src/main/java/com/fr/design/report/mobile/AppFitPreviewPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/mobile/AppFitPreviewPane.java @@ -1,12 +1,13 @@ package com.fr.design.report.mobile; import com.fine.theme.utils.FineUIUtils; -import com.fr.design.constants.UIConstants; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ilable.UILabel; +import com.fr.general.IOUtils; import javax.swing.ImageIcon; import java.awt.BorderLayout; +import java.awt.Image; import java.util.ArrayList; import static com.fine.swing.ui.layout.Layouts.cell; @@ -19,6 +20,17 @@ import static com.fine.swing.ui.layout.Layouts.row; */ public class AppFitPreviewPane extends BasicPane{ + public static final Image APPFIT_V0 = IOUtils.readImage("/com/fr/design/images/dialog/appfit/V0.png"); + public static final Image APPFIT_V1 = IOUtils.readImage("/com/fr/design/images/dialog/appfit/V1.png"); + public static final Image APPFIT_V2 = IOUtils.readImage("/com/fr/design/images/dialog/appfit/V2.png"); + public static final Image APPFIT_V3 = IOUtils.readImage("/com/fr/design/images/dialog/appfit/V3.png"); + public static final Image APPFIT_V4 = IOUtils.readImage("/com/fr/design/images/dialog/appfit/V4.png"); + public static final Image APPFIT_H0 = IOUtils.readImage("/com/fr/design/images/dialog/appfit/H0.png"); + public static final Image APPFIT_H1 = IOUtils.readImage("/com/fr/design/images/dialog/appfit/H1.png"); + public static final Image APPFIT_H2 = IOUtils.readImage("/com/fr/design/images/dialog/appfit/H2.png"); + public static final Image APPFIT_H3 = IOUtils.readImage("/com/fr/design/images/dialog/appfit/H3.png"); + public static final Image APPFIT_H4 = IOUtils.readImage("/com/fr/design/images/dialog/appfit/H4.png"); + private UILabel horizontalImageLabel; private UILabel verticalImagelabel; @@ -36,16 +48,16 @@ public class AppFitPreviewPane extends BasicPane{ } private void initCacheImage() { - cachedVerticalPreviewImage.add(new ImageIcon(UIConstants.APPFIT_V0)); - cachedVerticalPreviewImage.add(new ImageIcon(UIConstants.APPFIT_V1)); - cachedVerticalPreviewImage.add(new ImageIcon(UIConstants.APPFIT_V2)); - cachedVerticalPreviewImage.add(new ImageIcon(UIConstants.APPFIT_V3)); - cachedVerticalPreviewImage.add(new ImageIcon(UIConstants.APPFIT_V4)); - cachedHorizonPreviewImage.add(new ImageIcon(UIConstants.APPFIT_H0)); - cachedHorizonPreviewImage.add(new ImageIcon(UIConstants.APPFIT_H1)); - cachedHorizonPreviewImage.add(new ImageIcon(UIConstants.APPFIT_H2)); - cachedHorizonPreviewImage.add(new ImageIcon(UIConstants.APPFIT_H3)); - cachedHorizonPreviewImage.add(new ImageIcon(UIConstants.APPFIT_H4)); + cachedVerticalPreviewImage.add(new ImageIcon(APPFIT_V0)); + cachedVerticalPreviewImage.add(new ImageIcon(APPFIT_V1)); + cachedVerticalPreviewImage.add(new ImageIcon(APPFIT_V2)); + cachedVerticalPreviewImage.add(new ImageIcon(APPFIT_V3)); + cachedVerticalPreviewImage.add(new ImageIcon(APPFIT_V4)); + cachedHorizonPreviewImage.add(new ImageIcon(APPFIT_H0)); + cachedHorizonPreviewImage.add(new ImageIcon(APPFIT_H1)); + cachedHorizonPreviewImage.add(new ImageIcon(APPFIT_H2)); + cachedHorizonPreviewImage.add(new ImageIcon(APPFIT_H3)); + cachedHorizonPreviewImage.add(new ImageIcon(APPFIT_H4)); } private void initComponents() {