You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2019/04/07 12:30:43 UTC
[lucene-solr] 03/34: Move images,
fonts and message files to /org/apache/lucene/luke from the root
directory.
This is an automated email from the ASF dual-hosted git repository.
uschindler pushed a commit to branch jira/lucene-2562-luke-swing-3
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit d220ee06c2d1b21dfc2b9ce630b56c986d4699f7
Author: Tomoko Uchida <to...@gmail.com>
AuthorDate: Fri Apr 5 12:47:30 2019 +0900
Move images, fonts and message files to /org/apache/lucene/luke from the root directory.
---
dev-tools/idea/lucene/luke/luke.iml | 1 +
.../luke/app/desktop/components/LukeWindowProvider.java | 2 +-
.../components/dialog/menubar/AboutDialogFactory.java | 2 +-
.../components/dialog/menubar/CheckIndexDialogFactory.java | 2 +-
.../dialog/menubar/OptimizeIndexDialogFactory.java | 2 +-
.../org/apache/lucene/luke/app/desktop/util/FontUtils.java | 4 +++-
.../org/apache/lucene/luke/app/desktop/util/ImageUtils.java | 12 +++++-------
.../apache/lucene/luke/app/desktop/util/MessageUtils.java | 4 +++-
.../apache/lucene/luke/app/desktop}/font/ElegantIcons.ttf | Bin
.../apache/lucene/luke/app/desktop}/img/indicator.gif | Bin
.../apache/lucene/luke/app/desktop}/img/lucene-logo.gif | Bin
.../{ => org/apache/lucene/luke/app/desktop}/img/lucene.gif | Bin
.../apache/lucene/luke/app/desktop}/img/luke-logo.gif | Bin
.../lucene/luke/app/desktop/messages}/messages.properties | 0
14 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/dev-tools/idea/lucene/luke/luke.iml b/dev-tools/idea/lucene/luke/luke.iml
index 22ee541..9bd08ef 100644
--- a/dev-tools/idea/lucene/luke/luke.iml
+++ b/dev-tools/idea/lucene/luke/luke.iml
@@ -6,6 +6,7 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/work" />
</content>
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/LukeWindowProvider.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/LukeWindowProvider.java
index a88e6b9..347a8bf 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/LukeWindowProvider.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/LukeWindowProvider.java
@@ -159,7 +159,7 @@ public final class LukeWindowProvider implements LukeWindowOperator {
noReaderIcon.setVisible(false);
iconPanel.add(noReaderIcon);
- JLabel luceneIcon = new JLabel(ImageUtils.createImageIcon("/img/lucene.gif", "lucene", 16, 16));
+ JLabel luceneIcon = new JLabel(ImageUtils.createImageIcon("lucene.gif", "lucene", 16, 16));
iconPanel.add(luceneIcon);
c.gridx = 1;
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/AboutDialogFactory.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/AboutDialogFactory.java
index 06f8c8e..2395dee 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/AboutDialogFactory.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/AboutDialogFactory.java
@@ -98,7 +98,7 @@ public final class AboutDialogFactory implements DialogOpener.DialogFactory {
JPanel logo = new JPanel(new FlowLayout(FlowLayout.CENTER));
logo.setOpaque(false);
- logo.add(new JLabel(ImageUtils.createImageIcon("/img/luke-logo.gif", 200, 40)));
+ logo.add(new JLabel(ImageUtils.createImageIcon("luke-logo.gif", 200, 40)));
panel.add(logo);
JPanel project = new JPanel(new FlowLayout(FlowLayout.CENTER));
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/CheckIndexDialogFactory.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/CheckIndexDialogFactory.java
index 5aa78e5..c98faa1 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/CheckIndexDialogFactory.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/CheckIndexDialogFactory.java
@@ -124,7 +124,7 @@ public final class CheckIndexDialogFactory implements DialogOpener.DialogFactory
repairBtn.setEnabled(false);
repairBtn.addActionListener(listeners::repairIndex);
- indicatorLbl.setIcon(ImageUtils.createImageIcon("/img/indicator.gif", 20, 20));
+ indicatorLbl.setIcon(ImageUtils.createImageIcon("indicator.gif", 20, 20));
logArea.setEditable(false);
}
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/OptimizeIndexDialogFactory.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/OptimizeIndexDialogFactory.java
index 84c42a8..508e20c 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/OptimizeIndexDialogFactory.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/OptimizeIndexDialogFactory.java
@@ -114,7 +114,7 @@ public final class OptimizeIndexDialogFactory implements DialogOpener.DialogFact
maxSegSpnr.setModel(new SpinnerNumberModel(1, 1, 100, 1));
maxSegSpnr.setPreferredSize(new Dimension(100, 30));
- indicatorLbl.setIcon(ImageUtils.createImageIcon("/img/indicator.gif", 20, 20));
+ indicatorLbl.setIcon(ImageUtils.createImageIcon("indicator.gif", 20, 20));
logArea.setEditable(false);
}
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/FontUtils.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/FontUtils.java
index 700f4ad..c4f4758 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/FontUtils.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/FontUtils.java
@@ -28,6 +28,8 @@ import java.util.Map;
/** Font utilities */
public class FontUtils {
+ public static final String TTF_RESOURCE_NAME = "org/apache/lucene/luke/app/desktop/font/ElegantIcons.ttf";
+
@SuppressWarnings("unchecked")
public static JLabel toLinkText(JLabel label) {
label.setForeground(StyleConstants.LINK_COLOR);
@@ -39,7 +41,7 @@ public class FontUtils {
}
public static Font createElegantIconFont() throws IOException, FontFormatException {
- InputStream is = FontUtils.class.getClassLoader().getResourceAsStream("font/ElegantIcons.ttf");
+ InputStream is = FontUtils.class.getClassLoader().getResourceAsStream(TTF_RESOURCE_NAME);
return Font.createFont(Font.TRUETYPE_FONT, is);
}
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/ImageUtils.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/ImageUtils.java
index fcf299e..d7989f9 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/ImageUtils.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/ImageUtils.java
@@ -23,16 +23,14 @@ import java.awt.Image;
/** Image utilities */
public class ImageUtils {
- private static final int DEFAULT_ICON_WIDTH = 20;
+ private static final String IMAGE_BASE_DIR = "org/apache/lucene/luke/app/desktop/img/";
- private static final int DEFAULT_ICON_HEIGHT = 20;
-
- public static ImageIcon createImageIcon(String path, int width, int height) {
- return createImageIcon(path, "", width, height);
+ public static ImageIcon createImageIcon(String name, int width, int height) {
+ return createImageIcon(name, "", width, height);
}
- public static ImageIcon createImageIcon(String path, String description, int width, int height) {
- java.net.URL imgURL = ImageUtils.class.getResource(path);
+ public static ImageIcon createImageIcon(String name, String description, int width, int height) {
+ java.net.URL imgURL = ImageUtils.class.getClassLoader().getResource(IMAGE_BASE_DIR + name);
if (imgURL != null) {
ImageIcon originalIcon = new ImageIcon(imgURL, description);
ImageIcon icon = new ImageIcon(originalIcon.getImage().getScaledInstance(width, height, Image.SCALE_DEFAULT));
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/MessageUtils.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/MessageUtils.java
index ca80a6c..cc69891 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/MessageUtils.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/MessageUtils.java
@@ -31,6 +31,8 @@ import java.util.ResourceBundle;
*/
public class MessageUtils {
+ public static final String MESSAGE_BUNDLE_BASENAME = "org/apache/lucene/luke/app/desktop/messages/messages";
+
public static String getLocalizedMessage(String key) {
return bundle.getString(key);
}
@@ -52,7 +54,7 @@ public class MessageUtils {
}
};
- private static ResourceBundle bundle = ResourceBundle.getBundle("messages", Locale.ENGLISH, UTF8_RESOURCEBUNDLE_CONTROL);
+ private static ResourceBundle bundle = ResourceBundle.getBundle(MESSAGE_BUNDLE_BASENAME, Locale.ENGLISH, UTF8_RESOURCEBUNDLE_CONTROL);
private MessageUtils() {
}
diff --git a/lucene/luke/src/resources/font/ElegantIcons.ttf b/lucene/luke/src/resources/org/apache/lucene/luke/app/desktop/font/ElegantIcons.ttf
similarity index 100%
rename from lucene/luke/src/resources/font/ElegantIcons.ttf
rename to lucene/luke/src/resources/org/apache/lucene/luke/app/desktop/font/ElegantIcons.ttf
diff --git a/lucene/luke/src/resources/img/indicator.gif b/lucene/luke/src/resources/org/apache/lucene/luke/app/desktop/img/indicator.gif
similarity index 100%
rename from lucene/luke/src/resources/img/indicator.gif
rename to lucene/luke/src/resources/org/apache/lucene/luke/app/desktop/img/indicator.gif
diff --git a/lucene/luke/src/resources/img/lucene-logo.gif b/lucene/luke/src/resources/org/apache/lucene/luke/app/desktop/img/lucene-logo.gif
similarity index 100%
rename from lucene/luke/src/resources/img/lucene-logo.gif
rename to lucene/luke/src/resources/org/apache/lucene/luke/app/desktop/img/lucene-logo.gif
diff --git a/lucene/luke/src/resources/img/lucene.gif b/lucene/luke/src/resources/org/apache/lucene/luke/app/desktop/img/lucene.gif
similarity index 100%
rename from lucene/luke/src/resources/img/lucene.gif
rename to lucene/luke/src/resources/org/apache/lucene/luke/app/desktop/img/lucene.gif
diff --git a/lucene/luke/src/resources/img/luke-logo.gif b/lucene/luke/src/resources/org/apache/lucene/luke/app/desktop/img/luke-logo.gif
similarity index 100%
rename from lucene/luke/src/resources/img/luke-logo.gif
rename to lucene/luke/src/resources/org/apache/lucene/luke/app/desktop/img/luke-logo.gif
diff --git a/lucene/luke/src/resources/messages.properties b/lucene/luke/src/resources/org/apache/lucene/luke/app/desktop/messages/messages.properties
similarity index 100%
rename from lucene/luke/src/resources/messages.properties
rename to lucene/luke/src/resources/org/apache/lucene/luke/app/desktop/messages/messages.properties