fix project

fix .gitignore, fix librarie path, fix packagename for mensa
marunjar · Jun 4, 2014 · 4bb3967 · 4bb3967
1 parent 7c39b22
commit 4bb3967
Show file tree

Hide file tree

Showing 82 changed files with 102 additions and 44 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,22 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain
diff --git a/.gitignore b/.gitignore
@@ -1,12 +1,52 @@
-*.class
+#################
+## Eclipse
+#################
 
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
+*.pydevproject
+.project
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
 
-# Package Files #
-*.jar
-*.war
-*.ear
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+#############
+## Windows detritus
+#############
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac crap
+.DS_Store
diff --git a/bin/ANewJKUApp.apk b/bin/ANewJKUApp.apk
diff --git a/bin/classes.dex b/bin/classes.dex
diff --git a/bin/classes/.gitignore b/bin/classes/.gitignore
diff --git a/bin/jarlist.cache b/bin/jarlist.cache
@@ -2,4 +2,4 @@
 # format is <lastModified> <length> <SHA-1> <path>
 # Encoding is UTF-8
 1397414281280 648327 ded9acc6a9792b8f1afc470f0c9cd36d178914cd D:\GitHub\anewjkuapp\libs\android-support-v4.jar
-1396373445859 648327 ded9acc6a9792b8f1afc470f0c9cd36d178914cd D:\Workspace_ADT\appcompat_v7\libs\android-support-v4.jar
+1396373445859 648327 ded9acc6a9792b8f1afc470f0c9cd36d178914cd D:\GitHub\anewjkuapp_appcompat_v7\libs\android-support-v4.jar
diff --git a/bin/resources.ap_ b/bin/resources.ap_
diff --git a/gen/.gitignore b/gen/.gitignore
@@ -1,4 +1,4 @@
 /android
-/de
 /org
 /.gitignore
+/de
diff --git a/libs/android-support-v4.jar b/libs/android-support-v4.jar
diff --git a/libs/androidplot-core-0.6.1.jar b/libs/androidplot-core-0.6.1.jar
diff --git a/libs/backport-util-concurrent-3.1.jar b/libs/backport-util-concurrent-3.1.jar
diff --git a/libs/commons-codec-1.8.jar b/libs/commons-codec-1.8.jar
diff --git a/libs/commons-lang-2.6.jar b/libs/commons-lang-2.6.jar
diff --git a/libs/commons-logging-1.1.3.jar b/libs/commons-logging-1.1.3.jar
diff --git a/libs/dashclock-api-r2.0.jar b/libs/dashclock-api-r2.0.jar
diff --git a/libs/ical4j-1.0.5.jar b/libs/ical4j-1.0.5.jar
diff --git a/libs/jsoup-1.7.3.jar b/libs/jsoup-1.7.3.jar
diff --git a/libs/mapsforge-core-0.4.3.jar b/libs/mapsforge-core-0.4.3.jar
diff --git a/libs/mapsforge-map-0.4.3.jar b/libs/mapsforge-map-0.4.3.jar
diff --git a/libs/mapsforge-map-android-0.4.3.jar b/libs/mapsforge-map-android-0.4.3.jar
diff --git a/libs/mapsforge-map-awt-0.4.3.jar b/libs/mapsforge-map-awt-0.4.3.jar
diff --git a/libs/mapsforge-map-reader-0.4.3.jar b/libs/mapsforge-map-reader-0.4.3.jar
diff --git a/libs/svg-android-0.4.3.jar b/libs/svg-android-0.4.3.jar
diff --git a/project.properties b/project.properties
@@ -12,5 +12,5 @@
 
 # Project target.
 target=android-19
-android.library.reference.1=../../Workspace_ADT/appcompat_v7
-android.library.reference.2=../../Workspace_ADT/ckChangelog
+android.library.reference.1=..\\anewjkuapp_appcompat_v7
+android.library.reference.2=../anewjkuapp_ckchangelog
diff --git a/src/org/voidsink/anewjkuapp/MensaMenuAdapter.java b/src/org/voidsink/anewjkuapp/MensaMenuAdapter.java
@@ -6,9 +6,9 @@
 
 import org.voidsink.anewjkuapp.base.BaseArrayAdapter;
 import org.voidsink.anewjkuapp.calendar.CalendarUtils;
-import org.voidsink.anewjkuapp.kusss.mensa.Mensa;
-import org.voidsink.anewjkuapp.kusss.mensa.MensaMenu;
-import org.voidsink.anewjkuapp.kusss.mensa.MensaDay;
+import org.voidsink.anewjkuapp.mensa.Mensa;
+import org.voidsink.anewjkuapp.mensa.MensaDay;
+import org.voidsink.anewjkuapp.mensa.MensaMenu;
 
 import android.content.Context;
 import android.text.format.DateUtils;

diff --git a/src/org/voidsink/anewjkuapp/dashclock/MensaDashclockExtension.java b/src/org/voidsink/anewjkuapp/dashclock/MensaDashclockExtension.java
@@ -9,13 +9,13 @@
 import org.voidsink.anewjkuapp.R;
 import org.voidsink.anewjkuapp.activity.MainActivity;
 import org.voidsink.anewjkuapp.fragment.MensaFragment;
-import org.voidsink.anewjkuapp.kusss.mensa.ChoiceMenuLoader;
-import org.voidsink.anewjkuapp.kusss.mensa.ClassicMenuLoader;
-import org.voidsink.anewjkuapp.kusss.mensa.KHGMenuLoader;
-import org.voidsink.anewjkuapp.kusss.mensa.Mensa;
-import org.voidsink.anewjkuapp.kusss.mensa.MensaDay;
-import org.voidsink.anewjkuapp.kusss.mensa.MensaMenu;
-import org.voidsink.anewjkuapp.kusss.mensa.RaabMenuLoader;
+import org.voidsink.anewjkuapp.mensa.ChoiceMenuLoader;
+import org.voidsink.anewjkuapp.mensa.ClassicMenuLoader;
+import org.voidsink.anewjkuapp.mensa.KHGMenuLoader;
+import org.voidsink.anewjkuapp.mensa.Mensa;
+import org.voidsink.anewjkuapp.mensa.MensaDay;
+import org.voidsink.anewjkuapp.mensa.MensaMenu;
+import org.voidsink.anewjkuapp.mensa.RaabMenuLoader;
 
 import android.content.Intent;
 import android.content.SharedPreferences;

diff --git a/src/org/voidsink/anewjkuapp/fragment/MensaChoiceFragment.java b/src/org/voidsink/anewjkuapp/fragment/MensaChoiceFragment.java
@@ -1,7 +1,7 @@
 package org.voidsink.anewjkuapp.fragment;
 
-import org.voidsink.anewjkuapp.kusss.mensa.ChoiceMenuLoader;
-import org.voidsink.anewjkuapp.kusss.mensa.MenuLoader;
+import org.voidsink.anewjkuapp.mensa.ChoiceMenuLoader;
+import org.voidsink.anewjkuapp.mensa.MenuLoader;
 
 public class MensaChoiceFragment extends MensaFragmentDetail {
 

diff --git a/src/org/voidsink/anewjkuapp/fragment/MensaClassicFragment.java b/src/org/voidsink/anewjkuapp/fragment/MensaClassicFragment.java
@@ -1,7 +1,7 @@
 package org.voidsink.anewjkuapp.fragment;
 
-import org.voidsink.anewjkuapp.kusss.mensa.ClassicMenuLoader;
-import org.voidsink.anewjkuapp.kusss.mensa.MenuLoader;
+import org.voidsink.anewjkuapp.mensa.ClassicMenuLoader;
+import org.voidsink.anewjkuapp.mensa.MenuLoader;
 
 public class MensaClassicFragment extends MensaFragmentDetail {
 

diff --git a/src/org/voidsink/anewjkuapp/fragment/MensaFragmentDetail.java b/src/org/voidsink/anewjkuapp/fragment/MensaFragmentDetail.java
@@ -3,8 +3,8 @@
 import org.voidsink.anewjkuapp.MensaMenuAdapter;
 import org.voidsink.anewjkuapp.R;
 import org.voidsink.anewjkuapp.base.BaseFragment;
-import org.voidsink.anewjkuapp.kusss.mensa.Mensa;
-import org.voidsink.anewjkuapp.kusss.mensa.MenuLoader;
+import org.voidsink.anewjkuapp.mensa.Mensa;
+import org.voidsink.anewjkuapp.mensa.MenuLoader;
 
 import android.content.Context;
 import android.os.AsyncTask;

diff --git a/src/org/voidsink/anewjkuapp/fragment/MensaKHGFragment.java b/src/org/voidsink/anewjkuapp/fragment/MensaKHGFragment.java
@@ -1,7 +1,7 @@
 package org.voidsink.anewjkuapp.fragment;
 
-import org.voidsink.anewjkuapp.kusss.mensa.KHGMenuLoader;
-import org.voidsink.anewjkuapp.kusss.mensa.MenuLoader;
+import org.voidsink.anewjkuapp.mensa.KHGMenuLoader;
+import org.voidsink.anewjkuapp.mensa.MenuLoader;
 
 public class MensaKHGFragment extends MensaFragmentDetail {
 

diff --git a/src/org/voidsink/anewjkuapp/fragment/MensaRaabFragment.java b/src/org/voidsink/anewjkuapp/fragment/MensaRaabFragment.java
@@ -1,7 +1,7 @@
 package org.voidsink.anewjkuapp.fragment;
 
-import org.voidsink.anewjkuapp.kusss.mensa.MenuLoader;
-import org.voidsink.anewjkuapp.kusss.mensa.RaabMenuLoader;
+import org.voidsink.anewjkuapp.mensa.MenuLoader;
+import org.voidsink.anewjkuapp.mensa.RaabMenuLoader;
 
 public class MensaRaabFragment extends MensaFragmentDetail {
 

diff --git a/...wjkuapp/kusss/mensa/ChoiceMenuLoader.java → ...nk/anewjkuapp/mensa/ChoiceMenuLoader.java b/...wjkuapp/kusss/mensa/ChoiceMenuLoader.java → ...nk/anewjkuapp/mensa/ChoiceMenuLoader.java
@@ -1,4 +1,4 @@
-package org.voidsink.anewjkuapp.kusss.mensa;
+package org.voidsink.anewjkuapp.mensa;
 
 public class ChoiceMenuLoader extends JSONMenuLoader {
 

diff --git a/...jkuapp/kusss/mensa/ClassicMenuLoader.java → ...k/anewjkuapp/mensa/ClassicMenuLoader.java b/...jkuapp/kusss/mensa/ClassicMenuLoader.java → ...k/anewjkuapp/mensa/ClassicMenuLoader.java
@@ -1,4 +1,4 @@
-package org.voidsink.anewjkuapp.kusss.mensa;
+package org.voidsink.anewjkuapp.mensa;
 
 public class ClassicMenuLoader extends JSONMenuLoader {
 

diff --git a/...newjkuapp/kusss/mensa/JSONMenuLoader.java → ...sink/anewjkuapp/mensa/JSONMenuLoader.java b/...newjkuapp/kusss/mensa/JSONMenuLoader.java → ...sink/anewjkuapp/mensa/JSONMenuLoader.java
@@ -1,4 +1,4 @@
-package org.voidsink.anewjkuapp.kusss.mensa;
+package org.voidsink.anewjkuapp.mensa;
 
 import java.io.BufferedReader;
 import java.io.IOException;

diff --git a/...anewjkuapp/kusss/mensa/KHGMenuLoader.java → ...dsink/anewjkuapp/mensa/KHGMenuLoader.java b/...anewjkuapp/kusss/mensa/KHGMenuLoader.java → ...dsink/anewjkuapp/mensa/KHGMenuLoader.java
@@ -1,4 +1,4 @@
-package org.voidsink.anewjkuapp.kusss.mensa;
+package org.voidsink.anewjkuapp.mensa;
 
 public class KHGMenuLoader extends JSONMenuLoader {
 

diff --git a/...oidsink/anewjkuapp/kusss/mensa/Mensa.java → src/org/voidsink/anewjkuapp/mensa/Mensa.java b/...oidsink/anewjkuapp/kusss/mensa/Mensa.java → src/org/voidsink/anewjkuapp/mensa/Mensa.java
@@ -1,4 +1,4 @@
-package org.voidsink.anewjkuapp.kusss.mensa;
+package org.voidsink.anewjkuapp.mensa;
 
 import java.util.ArrayList;
 import java.util.Date;

diff --git a/...sink/anewjkuapp/kusss/mensa/MensaDay.java → ...g/voidsink/anewjkuapp/mensa/MensaDay.java b/...sink/anewjkuapp/kusss/mensa/MensaDay.java → ...g/voidsink/anewjkuapp/mensa/MensaDay.java
@@ -1,4 +1,4 @@
-package org.voidsink.anewjkuapp.kusss.mensa;
+package org.voidsink.anewjkuapp.mensa;
 
 import android.annotation.SuppressLint;
 import java.text.ParseException;

diff --git a/...ink/anewjkuapp/kusss/mensa/MensaMenu.java → .../voidsink/anewjkuapp/mensa/MensaMenu.java b/...ink/anewjkuapp/kusss/mensa/MensaMenu.java → .../voidsink/anewjkuapp/mensa/MensaMenu.java
@@ -1,4 +1,4 @@
-package org.voidsink.anewjkuapp.kusss.mensa;
+package org.voidsink.anewjkuapp.mensa;
 
 import org.json.JSONException;
 import org.json.JSONObject;

diff --git a/...nk/anewjkuapp/kusss/mensa/MenuLoader.java → ...voidsink/anewjkuapp/mensa/MenuLoader.java b/...nk/anewjkuapp/kusss/mensa/MenuLoader.java → ...voidsink/anewjkuapp/mensa/MenuLoader.java
@@ -1,4 +1,4 @@
-package org.voidsink.anewjkuapp.kusss.mensa;
+package org.voidsink.anewjkuapp.mensa;
 
 import android.content.Context;
 

diff --git a/...newjkuapp/kusss/mensa/RaabMenuLoader.java → ...sink/anewjkuapp/mensa/RaabMenuLoader.java b/...newjkuapp/kusss/mensa/RaabMenuLoader.java → ...sink/anewjkuapp/mensa/RaabMenuLoader.java
@@ -1,4 +1,4 @@
-package org.voidsink.anewjkuapp.kusss.mensa;
+package org.voidsink.anewjkuapp.mensa;
 
 public class RaabMenuLoader extends JSONMenuLoader {
 

diff --git a/tools/mapGenerator/osmosis/lib/default/aopalliance-1.0.jar b/tools/mapGenerator/osmosis/lib/default/aopalliance-1.0.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/commons-codec-1.7.jar b/tools/mapGenerator/osmosis/lib/default/commons-codec-1.7.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/commons-compress-1.4.1.jar b/tools/mapGenerator/osmosis/lib/default/commons-compress-1.4.1.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/commons-dbcp-1.4.jar b/tools/mapGenerator/osmosis/lib/default/commons-dbcp-1.4.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/commons-logging-1.1.1.jar b/tools/mapGenerator/osmosis/lib/default/commons-logging-1.1.1.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/commons-pool-1.5.4.jar b/tools/mapGenerator/osmosis/lib/default/commons-pool-1.5.4.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/jpf-1.5.jar b/tools/mapGenerator/osmosis/lib/default/jpf-1.5.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/mysql-connector-java-5.1.21.jar b/tools/mapGenerator/osmosis/lib/default/mysql-connector-java-5.1.21.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/netty-3.2.7.Final.jar b/tools/mapGenerator/osmosis/lib/default/netty-3.2.7.Final.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/osmosis-apidb-0.43-RELEASE.jar b/tools/mapGenerator/osmosis/lib/default/osmosis-apidb-0.43-RELEASE.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/osmosis-areafilter-0.43-RELEASE.jar b/tools/mapGenerator/osmosis/lib/default/osmosis-areafilter-0.43-RELEASE.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/osmosis-core-0.43-RELEASE.jar b/tools/mapGenerator/osmosis/lib/default/osmosis-core-0.43-RELEASE.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/osmosis-dataset-0.43-RELEASE.jar b/tools/mapGenerator/osmosis/lib/default/osmosis-dataset-0.43-RELEASE.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/osmosis-extract-0.43-RELEASE.jar b/tools/mapGenerator/osmosis/lib/default/osmosis-extract-0.43-RELEASE.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/osmosis-hstore-jdbc-0.43-RELEASE.jar b/tools/mapGenerator/osmosis/lib/default/osmosis-hstore-jdbc-0.43-RELEASE.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/osmosis-osm-binary-0.43-RELEASE.jar b/tools/mapGenerator/osmosis/lib/default/osmosis-osm-binary-0.43-RELEASE.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/osmosis-pbf-0.43-RELEASE.jar b/tools/mapGenerator/osmosis/lib/default/osmosis-pbf-0.43-RELEASE.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/osmosis-pbf2-0.43-RELEASE.jar b/tools/mapGenerator/osmosis/lib/default/osmosis-pbf2-0.43-RELEASE.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/osmosis-pgsimple-0.43-RELEASE.jar b/tools/mapGenerator/osmosis/lib/default/osmosis-pgsimple-0.43-RELEASE.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/osmosis-pgsnapshot-0.43-RELEASE.jar b/tools/mapGenerator/osmosis/lib/default/osmosis-pgsnapshot-0.43-RELEASE.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/osmosis-replication-0.43-RELEASE.jar b/tools/mapGenerator/osmosis/lib/default/osmosis-replication-0.43-RELEASE.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/osmosis-replication-http-0.43-RELEASE.jar b/tools/mapGenerator/osmosis/lib/default/osmosis-replication-http-0.43-RELEASE.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/osmosis-set-0.43-RELEASE.jar b/tools/mapGenerator/osmosis/lib/default/osmosis-set-0.43-RELEASE.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/osmosis-tagfilter-0.43-RELEASE.jar b/tools/mapGenerator/osmosis/lib/default/osmosis-tagfilter-0.43-RELEASE.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/osmosis-tagtransform-0.43-RELEASE.jar b/tools/mapGenerator/osmosis/lib/default/osmosis-tagtransform-0.43-RELEASE.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/osmosis-xml-0.43-RELEASE.jar b/tools/mapGenerator/osmosis/lib/default/osmosis-xml-0.43-RELEASE.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/plexus-classworlds-2.4.jar b/tools/mapGenerator/osmosis/lib/default/plexus-classworlds-2.4.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/postgis-jdbc-1.3.3.jar b/tools/mapGenerator/osmosis/lib/default/postgis-jdbc-1.3.3.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/postgresql-9.1-901-1.jdbc4.jar b/tools/mapGenerator/osmosis/lib/default/postgresql-9.1-901-1.jdbc4.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/protobuf-java-2.4.1.jar b/tools/mapGenerator/osmosis/lib/default/protobuf-java-2.4.1.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/spring-aop-3.1.2.RELEASE.jar b/tools/mapGenerator/osmosis/lib/default/spring-aop-3.1.2.RELEASE.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/spring-asm-3.1.2.RELEASE.jar b/tools/mapGenerator/osmosis/lib/default/spring-asm-3.1.2.RELEASE.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/spring-beans-3.1.2.RELEASE.jar b/tools/mapGenerator/osmosis/lib/default/spring-beans-3.1.2.RELEASE.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/spring-context-3.1.2.RELEASE.jar b/tools/mapGenerator/osmosis/lib/default/spring-context-3.1.2.RELEASE.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/spring-core-3.1.2.RELEASE.jar b/tools/mapGenerator/osmosis/lib/default/spring-core-3.1.2.RELEASE.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/spring-expression-3.1.2.RELEASE.jar b/tools/mapGenerator/osmosis/lib/default/spring-expression-3.1.2.RELEASE.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/spring-jdbc-3.1.2.RELEASE.jar b/tools/mapGenerator/osmosis/lib/default/spring-jdbc-3.1.2.RELEASE.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/spring-tx-3.1.2.RELEASE.jar b/tools/mapGenerator/osmosis/lib/default/spring-tx-3.1.2.RELEASE.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/stax2-api-3.1.1.jar b/tools/mapGenerator/osmosis/lib/default/stax2-api-3.1.1.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/woodstox-core-lgpl-4.1.4.jar b/tools/mapGenerator/osmosis/lib/default/woodstox-core-lgpl-4.1.4.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/xercesImpl-2.9.1.jar b/tools/mapGenerator/osmosis/lib/default/xercesImpl-2.9.1.jar
diff --git a/tools/mapGenerator/osmosis/lib/default/xz-1.0.jar b/tools/mapGenerator/osmosis/lib/default/xz-1.0.jar