some refactoring; import from jm still got issues; moved some functio…

…nal into IModel (Helper now has only fieldStorage. i would move it too, but interfaces cant have instance properties)
klesun · Jul 14, 2015 · fbd59b3 · fbd59b3
1 parent 183e64f
commit fbd59b3
Show file tree

Hide file tree

Showing 114 changed files with 757 additions and 818 deletions.
diff --git a/build.sh b/build.sh
@@ -1,5 +1,5 @@
 #javac -sourcepath "./src" -d "./bin" "./src/main/Main.java" -cp "libs/commons-math3-3.5.jar:libs/guava-18.0.jar"
-#cp -R src/Gui/imgs bin/Gui/
+#cp -R src/gui/imgs bin/gui/
 
 function join { local IFS="$1"; shift; echo "$*"; }
 
@@ -8,4 +8,4 @@ libs_query=$(join : libs/*)
 mkdir -p bin
 
 javac -sourcepath "./src" -d "./bin" "./src/main/Main.java" -cp $libs_query
-cp -R src/Gui/imgs bin/Gui/
+cp -R src/gui/imgs bin/gui/
diff --git a/imgs/Thumbs.db b/imgs/Thumbs.db
diff --git a/src/Gui/imgs/0_sized.png b/src/Gui/imgs/0_sized.png
diff --git a/src/Gui/imgs/16_sized.png b/src/Gui/imgs/16_sized.png
diff --git a/src/Gui/imgs/1_sized.png b/src/Gui/imgs/1_sized.png
diff --git a/src/Gui/imgs/2_sized.png b/src/Gui/imgs/2_sized.png
diff --git a/src/Gui/imgs/4_sized.png b/src/Gui/imgs/4_sized.png
diff --git a/src/Gui/imgs/8_sized.png b/src/Gui/imgs/8_sized.png
diff --git a/src/Gui/imgs/MyPointer.png b/src/Gui/imgs/MyPointer.png
diff --git a/src/Gui/imgs/bass_sized.png b/src/Gui/imgs/bass_sized.png
diff --git a/src/Gui/imgs/flat_sized.png b/src/Gui/imgs/flat_sized.png
diff --git a/src/Gui/imgs/instrument.png b/src/Gui/imgs/instrument.png
diff --git a/src/Gui/imgs/sharp_sized.png b/src/Gui/imgs/sharp_sized.png
diff --git a/src/Gui/imgs/vio_sized.png b/src/Gui/imgs/vio_sized.png
diff --git a/src/Gui/imgs/volume.png b/src/Gui/imgs/volume.png
diff --git a/src/Model/Action.java b/src/Model/Action.java
diff --git a/src/Model/ActionFactory.java b/src/Model/ActionFactory.java
diff --git a/src/Model/Helper.java b/src/Model/Helper.java
diff --git a/src/Model/IModel.java b/src/Model/IModel.java
diff --git a/src/Stuff/Tools/jmusicIntegration/INota.java b/src/Stuff/Tools/jmusicIntegration/INota.java