gui fixes and performance improvements

Author: chaosfox

base/src/org/open2jam/gui/Interface.java

@@ -17,6 +17,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
+import java.text.DecimalFormat;
 import java.util.Arrays;
 import java.util.List;
 import java.util.ArrayList;
@@ -75,9 +76,12 @@ public Interface() {
         table_sorter = new TableRowSorter<ChartListTableModel>(model_songlist);
         table_songlist.setRowSorter(table_sorter);
         txt_filter.getDocument().addDocumentListener(new DocumentListener() {
+            @Override
             public void insertUpdate(DocumentEvent e) {updateFilter();}
+            @Override
             public void removeUpdate(DocumentEvent e) {updateFilter();}
-            public void changedUpdate(DocumentEvent e) {updateFilter();}
+            @Override
+            public void changedUpdate(DocumentEvent e) {}
         });
 
         loadDirlist();
@@ -99,13 +103,15 @@ public void windowClosed(WindowEvent arg0) {
         col.setPreferredWidth(80);
 
         table_chartlist.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
+            @Override
             public void valueChanged(ListSelectionEvent e)
             {
                 if (e.getValueIsAdjusting()) return;
                 javax.swing.ListSelectionModel lsm = (javax.swing.ListSelectionModel)e.getSource();
                 if(lsm.isSelectionEmpty()) return;
                 int selectedRow = lsm.getMinSelectionIndex();
                 if(selectedRow < 0) return;
+                if(selected_chart.get(selectedRow) == selected_header)return;
                 selected_header = selected_chart.get(selectedRow);
                 if(selectedRow != rank)
                 {
@@ -917,6 +923,7 @@ private void initLogic() {
             List<DisplayMode> list = Arrays.asList(Display.getAvailableDisplayModes());
 
             Collections.sort(list, new Comparator<DisplayMode>() {
+                @Override
                 public int compare(DisplayMode dm1, DisplayMode dm2) {
 
                     if(dm1.getBitsPerPixel() == dm2.getBitsPerPixel())
@@ -1012,6 +1019,7 @@ private void loadDirlist()
         }
     }
 
+    @Override
     public void propertyChange(PropertyChangeEvent evt) {
         if("progress".equals(evt.getPropertyName()))
         {
@@ -1037,6 +1045,7 @@ void updateFilter() {
         }
     }
 
+    @Override
     public void valueChanged(ListSelectionEvent e) {
         int i = table_songlist.getSelectedRow();
         if(i < 0 && last_model_idx >= 0){
@@ -1047,6 +1056,7 @@ public void valueChanged(ListSelectionEvent e) {
         }else{
             i = table_songlist.convertRowIndexToModel(i);
         }
+        if(model_songlist.getRow(i) == selected_chart)return;
         selected_chart = model_songlist.getRow(i);
         if(selected_chart.size() > rank)selected_header = selected_chart.get(rank);
         if(selected_chart != model_chartlist.getChartList()){
@@ -1057,9 +1067,11 @@ public void valueChanged(ListSelectionEvent e) {
             table_chartlist.getSelectionModel().setSelectionInterval(0, 0);
         else
             table_chartlist.getSelectionModel().setSelectionInterval(0, rank);
+        
         updateInfo();
     }
 
+    private DecimalFormat bpm_format = new DecimalFormat(".##");
     private void updateInfo()
     {
         if(selected_header == null)return;
@@ -1069,11 +1081,10 @@ private void updateInfo()
         lbl_filename.setText(resizeString(selected_header.getSource().getName(), 30));
         lbl_genre.setText(resizeString(selected_header.getGenre(), 30));
         lbl_level.setText(selected_header.getLevel()+"");
-        lbl_bpm.setText(Float.toString((float)selected_header.getBPM()*100/100));
+        lbl_bpm.setText(bpm_format.format(selected_header.getBPM()));
         lbl_notes.setText(selected_header.getNoteCount()+"");
 	lbl_keys.setText(selected_header.getKeys()+"");
-        int d = selected_header.getDuration();
-        lbl_time.setText((d/60)+":"+(d%60 < 10 ? "0"+(d%60) : (d%60)));
+        lbl_time.setText(time2Text(selected_header.getDuration()));
 
         BufferedImage i = selected_header.getCover();
 
@@ -1086,6 +1097,12 @@ private void updateInfo()
         else
             lbl_cover.setIcon(null);
     }
+    
+    private String time2Text(int secs) {
+        int h = secs / 60;
+        int m = secs % 60;
+        return m < 10 ? h+":0"+m : h+":"+m;
+    }
 
     private String resizeString(String string, int size)
     {

base/src/org/open2jam/parser/OJNChart.java

@@ -64,7 +64,6 @@ public BufferedImage getCover()
         try{
             RandomAccessFile f = new RandomAccessFile(source, "r");
             ByteBuffer buffer = f.getChannel().map(FileChannel.MapMode.READ_ONLY, cover_offset, cover_size);
-            buffer.order(java.nio.ByteOrder.LITTLE_ENDIAN);
             ByteBufferInputStream bis = new ByteBufferInputStream(buffer);
             f.close();
             return ImageIO.read(bis);

base/src/org/open2jam/render/Render.java

@@ -391,7 +391,7 @@ public void initialise()
         visibility_entity = new CompositeEntity();
         if(visibilityModifier != 0) visibility(visibilityModifier);
 
-        judgment_line = (Entity) skin.getEntityMap().get("JUDGMENT_LINE");
+        judgment_line = skin.getEntityMap().get("JUDGMENT_LINE");
         entities_matrix.add(judgment_line);
 
         for(Event.Channel c : keyboard_map.keySet())