cleanup

1. netbeans default exception log string is null, that means it will never actually log anything, I changed these cases to print the exception name 2. make the interface resize to accomodate the tabs 3. progress bar wasn't showing when the program starts without config.vl 4. add generics to combo_dirs, to stop the compiler from complaining 5. deleted sources/libs that are no longer used because fmod does the work now
chaosfox · Nov 18, 2012 · f555b4a · f555b4a
1 parent 1aff574
commit f555b4a
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 950 deletions.
diff --git a/DEPS b/DEPS
@@ -4,7 +4,7 @@
 - java 1.6
 
 - lwjgl 2.8.5 ,  lwjgl.org ( BSD License)
-- jorbis 0.0.17 , www.jcraft.com/jorbis ( GNU LGPL)
 - jChardet 1.1, jchardet.sourceforge.net ( MOZILLA PUBLIC LICENSE)
 - voile, github.com/chaosfox/voile
+- NativeFmodEx, jerome.jouvie.free.fr/nativefmodex (binding LGPL & lib FMOD Non-Commercial License - fmod.com/fmod-sales.html)
 
diff --git a/lib/jlayer-1.0.1-libgdx.jar b/lib/jlayer-1.0.1-libgdx.jar
diff --git a/lib/jorbis.jar b/lib/jorbis.jar
diff --git a/nbproject/project.properties b/nbproject/project.properties
@@ -28,9 +28,7 @@ endorsed.classpath=
 excludes=
 file.reference.chardet.jar=lib/chardet.jar
 file.reference.jinput.jar=lib\\jinput.jar
-file.reference.jlayer-1.0.1-libgdx.jar=lib/jlayer-1.0.1-libgdx.jar
 file.reference.jna-3.4.0.jar=lib/jna-3.4.0.jar
-file.reference.jorbis.jar=lib\\jorbis.jar
 file.reference.lwjgl.jar=lib\\lwjgl.jar
 file.reference.lwjgl_util.jar=lib\\lwjgl_util.jar
 file.reference.lzma.jar=lib\\lzma.jar
@@ -45,7 +43,6 @@ jar.compress=true
 jar.index=${jnlp.enabled}
 javac.classpath=\
     ${file.reference.jinput.jar}:\
-    ${file.reference.jorbis.jar}:\
     ${file.reference.lwjgl.jar}:\
     ${file.reference.lwjgl_util.jar}:\
     ${file.reference.lzma.jar}:\
@@ -54,7 +51,6 @@ javac.classpath=\
     ${file.reference.vlcj-2.0.0.jar}:\
     ${file.reference.chardet.jar}:\
     ${file.reference.voile.jar}:\
-    ${file.reference.jlayer-1.0.1-libgdx.jar}:\
     ${reference.open2jam-parsers.jar}:\
     ${file.reference.NativeFmodEx.jar}:\
     ${file.reference.partytime.jar}

diff --git a/parsers/src/org/open2jam/parsers/BMSParser.java b/parsers/src/org/open2jam/parsers/BMSParser.java
@@ -286,7 +286,7 @@ public static EventList parseChart(BMSChart chart)
 		lines.get(measure).add(line);
 	    }
 	} catch (IOException ex) {
-	    Logger.global.log(Level.SEVERE, null, ex);
+	    Logger.global.log(Level.SEVERE, "{0}", ex);
 	}
 
 	Iterator<List<String>> it = lines.values().iterator();
@@ -488,7 +488,7 @@ public static HashMap<Integer, SampleData> getSamples(BMSChart chart)
 		    }
 		}
 	    } catch (IOException ex) {
-		Logger.global.log(Level.SEVERE, null, ex);
+		Logger.global.log(Level.SEVERE, "{0}", ex);
 	    }
 	}
 	return samples;

diff --git a/parsers/src/org/open2jam/parsers/SMParser.java b/parsers/src/org/open2jam/parsers/SMParser.java
@@ -304,7 +304,7 @@ public static EventList parseChart(SMChart chart)
 		}
             }
         } catch (IOException ex) {
-            Logger.global.log(Level.SEVERE, null, ex);
+            Logger.global.log(Level.SEVERE, "{0}", ex);
         } catch(NoSuchElementException ignored) {}
 
 	//add the music
@@ -341,7 +341,7 @@ public static HashMap<Integer, SampleData> getSamples(SMChart chart)
 		    }
 		}
 	    } catch (IOException ex) {
-		Logger.global.log(Level.SEVERE, null, ex);
+		Logger.global.log(Level.SEVERE, "{0}", ex);
 	    }
 	}
 	return samples;

diff --git a/parsers/src/org/open2jam/parsers/utils/KrazyRainDB.java b/parsers/src/org/open2jam/parsers/utils/KrazyRainDB.java
@@ -145,12 +145,12 @@ private void load() {
 	    try {
 		SAXParserFactory.newInstance().newSAXParser().parse(resources_xml.openStream(), this);
 	    } catch (ParserConfigurationException ex) {
-		java.util.logging.Logger.getLogger(KrazyRainDB.class.getName()).log(Level.SEVERE, null, ex);
+		java.util.logging.Logger.getLogger(KrazyRainDB.class.getName()).log(Level.SEVERE, "{0}", ex);
 	    }
 	} catch (SAXException ex) {
-	    java.util.logging.Logger.getLogger(KrazyRainDB.class.getName()).log(Level.SEVERE, null, ex);
+	    java.util.logging.Logger.getLogger(KrazyRainDB.class.getName()).log(Level.SEVERE, "{0}", ex);
 	} catch (IOException ex) {
-	    java.util.logging.Logger.getLogger(KrazyRainDB.class.getName()).log(Level.SEVERE, null, ex);
+	    java.util.logging.Logger.getLogger(KrazyRainDB.class.getName()).log(Level.SEVERE, "{0}", ex);
 	}	
     }
 

diff --git a/src/org/open2jam/Config.java b/src/org/open2jam/Config.java
@@ -39,8 +39,10 @@ private static GameOptions loadGameOptions() {
             Object result = decoder.readObject();
             decoder.close();
             if (result instanceof GameOptions) return (GameOptions)result;
+        } catch(FileNotFoundException fnf) {
+            return null; // thats ok a new file will be created
         } catch (IOException ex) {
-            Logger.getLogger(Config.class.getName()).log(Level.SEVERE, null, ex);
+            Logger.getLogger(Config.class.getName()).log(Level.SEVERE, "{0}", ex);
         }
         return null;
     }
@@ -51,7 +53,7 @@ public static void saveGameOptions() {
             encoder.writeObject(options);
             encoder.close();
         } catch (IOException ex) {
-            Logger.getLogger(GameOptions.class.getName()).log(Level.SEVERE, null, ex);
+            Logger.getLogger(GameOptions.class.getName()).log(Level.SEVERE, "{0}", ex);
         }
     }
 

diff --git a/src/org/open2jam/gui/Interface.java b/src/org/open2jam/gui/Interface.java
@@ -29,6 +29,7 @@ public Interface() {
         Tabs.addTab("Configuration", new Configuration());
 
         this.addWindowListener(this);
+	pack();
     }
 
 

diff --git a/src/org/open2jam/gui/parts/MusicSelection.form b/src/org/open2jam/gui/parts/MusicSelection.form
@@ -212,6 +212,9 @@
           <Events>
             <EventHandler event="itemStateChanged" listener="java.awt.event.ItemListener" parameters="java.awt.event.ItemEvent" handler="combo_dirsItemStateChanged"/>
           </Events>
+          <AuxValues>
+            <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;FileItem&gt;"/>
+          </AuxValues>
         </Component>
         <Component class="javax.swing.JButton" name="btn_reload">
           <Properties>

diff --git a/src/org/open2jam/gui/parts/MusicSelection.java b/src/org/open2jam/gui/parts/MusicSelection.java
@@ -135,6 +135,7 @@ public String toString() {
     public MusicSelection() {
         initLogic();
         initComponents();
+        load_progress.setVisible(false);
 
         List<File> list = Config.getDirsList();
         for(File f : list)combo_dirs.addItem(new FileItem(f));
@@ -155,7 +156,6 @@ public MusicSelection() {
         else
             loadDir(cwd);
 
-        load_progress.setVisible(false);
         table_sorter = new TableRowSorter<ChartListTableModel>(model_songlist);
         table_songlist.setRowSorter(table_sorter);
         txt_filter.getDocument().addDocumentListener(new DocumentListener() {
@@ -204,7 +204,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 		try {
 		    BMSWriter.export(selected_header, "converted");
 		} catch (IOException ex) {
-		    java.util.logging.Logger.getLogger(MusicSelection.class.getName()).log(Level.SEVERE, null, ex);
+		    java.util.logging.Logger.getLogger(MusicSelection.class.getName()).log(Level.SEVERE, "{0}", ex);
 		} finally {
 		    System.gc();
 		}
@@ -293,7 +293,7 @@ private void initComponents() {
         bt_choose_dir = new javax.swing.JButton();
         load_progress = new javax.swing.JProgressBar();
         jLabel2 = new javax.swing.JLabel();
-        combo_dirs = new javax.swing.JComboBox();
+        combo_dirs = new javax.swing.JComboBox<FileItem>();
         btn_reload = new javax.swing.JButton();
         btn_delete = new javax.swing.JButton();
         panel_setting = new javax.swing.JPanel();
@@ -1177,7 +1177,7 @@ public void autosyncFinished(double audioLatency) {
 
             new RenderThread(this.getTopLevelAncestor(), r).start();
         } catch (SoundSystemException ex) {
-            java.util.logging.Logger.getLogger(MusicSelection.class.getName()).log(Level.SEVERE, null, ex);
+            java.util.logging.Logger.getLogger(MusicSelection.class.getName()).log(Level.SEVERE, "{0}", ex);
         }
 }//GEN-LAST:event_bt_playActionPerformed
 
@@ -1285,7 +1285,7 @@ private void btnCreateServerActionPerformed(java.awt.event.ActionEvent evt) {//G
     private javax.swing.JCheckBox cb_autoSyncDisplay;
     private javax.swing.JCheckBox cb_startPaused;
     private javax.swing.JComboBox combo_channelModifier;
-    private javax.swing.JComboBox combo_dirs;
+    private javax.swing.JComboBox<FileItem> combo_dirs;
     private javax.swing.JComboBox combo_displays;
     private javax.swing.JComboBox combo_speedType;
     private javax.swing.JComboBox combo_visibilityModifier;

diff --git a/src/org/open2jam/render/Render.java b/src/org/open2jam/render/Render.java
@@ -514,7 +514,7 @@ public void initialise()
 		    Sprite s = ResourceFactory.get().getSprite(img);
 		    bga_sprites.put(entry.getKey(), s);
 		} catch (IOException ex) {
-		    java.util.logging.Logger.getLogger(Render.class.getName()).log(Level.SEVERE, null, ex);
+		    java.util.logging.Logger.getLogger(Render.class.getName()).log(Level.SEVERE, "{0}", ex);
 		}    
 	    }
 	}
@@ -539,12 +539,12 @@ public void initialise()
                 Sound sound = soundSystem.load(sampleData);
                 sounds.put(entry.getKey(), sound);
             } catch (SoundSystemException ex) {
-                java.util.logging.Logger.getLogger(Render.class.getName()).log(Level.SEVERE, null, ex);
+                java.util.logging.Logger.getLogger(Render.class.getName()).log(Level.SEVERE, "{0}", ex);
             }
 	    try {
 		entry.getValue().dispose();
 	    } catch (IOException ex) {
-		java.util.logging.Logger.getLogger(Render.class.getName()).log(Level.SEVERE, null, ex);
+		java.util.logging.Logger.getLogger(Render.class.getName()).log(Level.SEVERE, "{0}", ex);
 	    }
 	}
 
@@ -1088,7 +1088,7 @@ public SoundInstance queueSample(Event.SoundSample soundSample)
             return sound.play(soundSample.isBGM() ? SoundChannel.BGM : SoundChannel.KEY,
                     1.0f, soundSample.pan);
         } catch (SoundSystemException ex) {
-            java.util.logging.Logger.getLogger(Render.class.getName()).log(Level.SEVERE, null, ex);
+            java.util.logging.Logger.getLogger(Render.class.getName()).log(Level.SEVERE, "{0}", ex);
             return null;
         }
     }

diff --git a/src/org/open2jam/render/lwjgl/LWJGLGameWindow.java b/src/org/open2jam/render/lwjgl/LWJGLGameWindow.java
@@ -112,7 +112,7 @@ public void startRendering()
             try {
                 Display.create();
             } catch (LWJGLException ex) {
-                Logger.global.log(Level.SEVERE, null, ex);
+                Logger.global.log(Level.SEVERE, "{0}", ex);
                 callback.windowClosed();
                 return;
             }

diff --git a/src/org/open2jam/render/lwjgl/SoundManager.java b/src/org/open2jam/render/lwjgl/SoundManager.java
diff --git a/src/org/open2jam/sound/FmodExSoundSystem.java b/src/org/open2jam/sound/FmodExSoundSystem.java
@@ -85,7 +85,7 @@ public org.open2jam.sound.Sound load(SampleData data) throws SoundSystemExceptio
         try {
             data.copyTo(out);
         } catch (IOException ex) {
-            Logger.getLogger(FmodExSoundSystem.class.getName()).log(Level.SEVERE, null, ex);
+            Logger.getLogger(FmodExSoundSystem.class.getName()).log(Level.SEVERE, "{0}", ex);
             return null;
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,6 +29,7 @@ public Interface() { @@
             Tabs.addTab("Configuration", new Configuration());
             this.addWindowListener(this);
+    	pack();
         }
@@ Expand Down @@