code tidy

This commit is contained in:
Branislav Stojkovic
2018-12-15 19:57:19 +01:00
parent 4aeaa25d1a
commit d506feac27
3 changed files with 8 additions and 8 deletions
+1 -1
View File
@@ -7,7 +7,7 @@
<property name="jar.dir" value="${build.dir}/jar" /> <property name="jar.dir" value="${build.dir}/jar" />
<property name="report.dir" value="${build.dir}/junitreport" /> <property name="report.dir" value="${build.dir}/junitreport" />
<property name="main.class" value="org.diylc.DIYLCStarter" /> <property name="main.class" value="org.diylc.DIYLCStarter" />
<property name="diylc.version" value="3.41.1" /> <property name="diylc.version" value="3.42.0" />
<property name="classes.dir" value="${build.dir}/temp/${ant.project.name}/classes" /> <property name="classes.dir" value="${build.dir}/temp/${ant.project.name}/classes" />
<property name="test.classes.dir" value="${build.dir}/temp/${ant.project.name}/test.classes" /> <property name="test.classes.dir" value="${build.dir}/temp/${ant.project.name}/test.classes" />
@@ -41,7 +41,7 @@ import java.util.EnumSet;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
import javax.swing.JComboBox; import javax.swing.JComboBox;
import javax.swing.JLabel; import javax.swing.JLabel;
@@ -49,10 +49,10 @@ import javax.swing.JOptionPane;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import javax.swing.UIManager; import javax.swing.UIManager;
import net.java.balloontip.BalloonTip; import net.java.balloontip.BalloonTip;
import net.java.balloontip.styles.EdgedBalloonStyle; import net.java.balloontip.styles.EdgedBalloonStyle;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.diylc.announcements.AnnouncementProvider; import org.diylc.announcements.AnnouncementProvider;
import org.diylc.appframework.miscutils.Utils; import org.diylc.appframework.miscutils.Utils;
@@ -79,7 +79,7 @@ public class StatusBar extends JPanel implements IPlugIn {
public static String UPDATE_URL = "http://www.diy-fever.com/update.xml"; public static String UPDATE_URL = "http://www.diy-fever.com/update.xml";
private static final Format sizeFormat = new DecimalFormat("0.##"); private static final Format sizeFormat = new DecimalFormat("0.##");
private JComboBox zoomBox; private JComboBox<Double> zoomBox;
private UpdateLabel updateLabel; private UpdateLabel updateLabel;
private JLabel announcementLabel; private JLabel announcementLabel;
private MemoryBar memoryPanel; private MemoryBar memoryPanel;
@@ -151,9 +151,9 @@ public class StatusBar extends JPanel implements IPlugIn {
}, false); }, false);
} }
private JComboBox getZoomBox() { private JComboBox<Double> getZoomBox() {
if (zoomBox == null) { if (zoomBox == null) {
zoomBox = new JComboBox(plugInPort.getAvailableZoomLevels()); zoomBox = new JComboBox<Double>(plugInPort.getAvailableZoomLevels());
zoomBox.setSelectedItem(plugInPort.getZoomLevel()); zoomBox.setSelectedItem(plugInPort.getZoomLevel());
zoomBox.setFocusable(false); zoomBox.setFocusable(false);
zoomBox.setRenderer(new PercentageListCellRenderer()); zoomBox.setRenderer(new PercentageListCellRenderer());
+1 -1
View File
@@ -1876,7 +1876,7 @@
<changes> <changes>
<org.diylc.appframework.update.Change> <org.diylc.appframework.update.Change>
<changeType>NEW_FEATURE</changeType> <changeType>NEW_FEATURE</changeType>
<description>Holding "shift" key switches mouse wheel scrolling from vertical to horizontal</description> <description>Holding "shift" key switches mouse wheel scrolling function from vertical to horizontal</description>
</org.diylc.appframework.update.Change> </org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change> <org.diylc.appframework.update.Change>
<changeType>NEW_FEATURE</changeType> <changeType>NEW_FEATURE</changeType>