Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Move the icons to a subfolder.

  • Loading branch information...
commit d777448f1fe8afda53ef85b44d7133609687190d 1 parent 3a8e7ac
@mjuhasz authored
View
4 pom.xml
@@ -133,7 +133,7 @@
</mapper>
</data>
<data>
- <src>${project.basedir}/src/main/resources/icon_128.png</src>
+ <src>${project.basedir}/src/main/resources/icons/bdsup2sub_128.png</src>
<dst>bdsup2sub.png</dst>
<type>file</type>
<mapper>
@@ -160,7 +160,7 @@
<mainClass>bdsup2sub.BDSup2Sub</mainClass>
<jvmVersion>1.6+</jvmVersion>
<javaApplicationStub>${basedir}/src/main/resources/JavaApplicationStub</javaApplicationStub>
- <iconFile>${project.basedir}/src/main/resources/bdsup2sub.icns</iconFile>
+ <iconFile>${project.basedir}/src/main/resources/icons/bdsup2sub.icns</iconFile>
<bundleName>BDSup2Sub</bundleName>
</configuration>
</execution>
View
10 src/main/java/bdsup2sub/gui/main/MainFrameController.java
@@ -687,7 +687,7 @@ private void showAboutDialog() {
+ "Copyright © 2009 Volker Oth, 2011-2012 Miklos Juhasz",
Constants.APP_NAME,
JOptionPane.INFORMATION_MESSAGE,
- new ImageIcon(getClass().getClassLoader().getResource("icon_32.png")));
+ new ImageIcon(getClass().getClassLoader().getResource("icons/bdsup2sub_32.png")));
}
private class SubNumComboBoxActionListener implements ActionListener {
@@ -1176,11 +1176,11 @@ public void run() {
private class CopyPopupMenuItemActionListener implements ActionListener {
@Override
public void actionPerformed(ActionEvent event) {
- String s = view.getConsoleSelectedText();
+ String selectedText = view.getConsoleSelectedText();
try {
- if ( s!= null) {
+ if (selectedText != null) {
Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(""), view);
- Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(s), view);
+ Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(selectedText), view);
}
} catch (OutOfMemoryError ex) {
JOptionPane.showMessageDialog(view, "Out of heap! Use -Xmx256m to increase heap!" , "Error!", JOptionPane.WARNING_MESSAGE);
@@ -1264,7 +1264,7 @@ private void handle(ApplicationEvent event, String message) {
message,
Constants.APP_NAME,
JOptionPane.INFORMATION_MESSAGE,
- new ImageIcon(getClass().getClassLoader().getResource("icon_32.png")));
+ new ImageIcon(getClass().getClassLoader().getResource("icons/bdsup2sub_32.png")));
}
public void handleAbout(ApplicationEvent event) {
View
2  src/main/java/bdsup2sub/gui/main/MainFrameView.java
@@ -115,7 +115,7 @@ private void initialize() {
initAlphaThresholdComboBoxSelectedIndices();
updateRecentFilesMenu();
- setIconImage(Toolkit.getDefaultToolkit().getImage(getClass().getClassLoader().getResource("icon_32.png")));
+ setIconImage(Toolkit.getDefaultToolkit().getImage(getClass().getClassLoader().getResource("icons/bdsup2sub_32.png")));
setLocation();
}
View
0  src/main/resources/bdsup2sub.icns → src/main/resources/icons/bdsup2sub.icns
File renamed without changes
View
0  src/main/resources/bdsup2sub.ico → src/main/resources/icons/bdsup2sub.ico
File renamed without changes
View
0  src/main/resources/icon_128.png → src/main/resources/icons/bdsup2sub_128.png
File renamed without changes
View
0  src/main/resources/icon_16.png → src/main/resources/icons/bdsup2sub_16.png
File renamed without changes
View
0  src/main/resources/icon_32.png → src/main/resources/icons/bdsup2sub_32.png
File renamed without changes
View
0  src/main/resources/icon_48.png → src/main/resources/icons/bdsup2sub_48.png
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.