Browse code

corrections

devnewton authored on 19/02/2013 at 20:21:19
Showing 8 changed files
... ...
@@ -4,7 +4,7 @@
4 4
 
5 5
     <groupId>im.bci</groupId>
6 6
     <artifactId>tiledmerge</artifactId>
7
-    <version>1.0-SNAPSHOT</version>
7
+    <version>1.0</version>
8 8
     <packaging>jar</packaging>
9 9
 
10 10
     <name>tiledmerge</name>
... ...
@@ -31,6 +31,43 @@
31 31
             <version>1.3.2</version>
32 32
         </dependency>
33 33
     </dependencies>
34
+    
35
+    <build>
36
+        <plugins>
37
+            <plugin>
38
+                <groupId>org.apache.maven.plugins</groupId>
39
+                <artifactId>maven-shade-plugin</artifactId>
40
+                <version>1.6</version>
41
+                <executions>
42
+                    <execution>
43
+                        <phase>package</phase>
44
+                        <goals>
45
+                            <goal>shade</goal>
46
+                        </goals>
47
+                        <configuration>
48
+                            <transformers>
49
+                                <transformer
50
+                                    implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
51
+                                    <manifestEntries>
52
+                                        <Main-Class>im.bci.tiledmerge.App</Main-Class>
53
+                                    </manifestEntries>
54
+                                </transformer>
55
+                            </transformers>
56
+                        </configuration>
57
+                    </execution>
58
+                </executions>
59
+            </plugin>
60
+            <plugin>
61
+                <groupId>org.apache.maven.plugins</groupId>
62
+                <artifactId>maven-compiler-plugin</artifactId>
63
+                <version>2.3.2</version>
64
+                <configuration>
65
+                    <source>1.7</source>
66
+                    <target>1.7</target>
67
+                </configuration>
68
+            </plugin>
69
+        </plugins>
70
+    </build>
34 71
   
35 72
     <repositories>
36 73
         <repository>
37 74
Binary files a/repo/im/bci/libtiled/1.0/libtiled-1.0.jar and b/repo/im/bci/libtiled/1.0/libtiled-1.0.jar differ
... ...
@@ -1 +1 @@
1
-22ebfe527493a22657e7ada52ceffcb6
2 1
\ No newline at end of file
2
+50d9f1e5c2ce45a71bd682a242f41481
3 3
\ No newline at end of file
... ...
@@ -1 +1 @@
1
-c6ddac96bb91da50ca5c4788f449f1553495faff
2 1
\ No newline at end of file
2
+931bdb66c1546176ea583cbb381a19dd9aab043a
3 3
\ No newline at end of file
... ...
@@ -7,6 +7,6 @@
7 7
     <versions>
8 8
       <version>1.0</version>
9 9
     </versions>
10
-    <lastUpdated>20130219190837</lastUpdated>
10
+    <lastUpdated>20130219201251</lastUpdated>
11 11
   </versioning>
12 12
 </metadata>
... ...
@@ -1 +1 @@
1
-b5ae32bf62cbf520593969632540b217
2 1
\ No newline at end of file
2
+84a1a2e54adb88fc1f6e7b0eb47791d1
3 3
\ No newline at end of file
... ...
@@ -1 +1 @@
1
-2731c06bb329c43db031bfb0926c7b8b5b79d509
2 1
\ No newline at end of file
2
+f1f5925b475b75a4dd3b9a5d871ff6a507197a9c
3 3
\ No newline at end of file
... ...
@@ -59,12 +59,10 @@ public class TiledMerger {
59 59
     private List<MergeableTile> tiles = new ArrayList<MergeableTile>();
60 60
 
61 61
     void addTmx(File file) {
62
-        System.out.println("Merge " + file);
62
+        System.out.println("Merge '" + file + "'");
63 63
         try {
64 64
             TMXMapReader reader = new TMXMapReader();
65
-            FileInputStream is = new FileInputStream(file);
66
-            try {
67
-                tiled.core.Map map = reader.readMap(is);
65
+                tiled.core.Map map = reader.readMap(file.getCanonicalPath());
68 66
                 maps.put(file, map);
69 67
 
70 68
                 for (TileSet tileset : map.getTileSets()) {
... ...
@@ -73,9 +71,6 @@ public class TiledMerger {
73 73
                         mergeOrAddToTile(mergeable);
74 74
                     }
75 75
                 }
76
-            } finally {
77
-                is.close();
78
-            }
79 76
         } catch (Exception ex) {
80 77
             Logger.getLogger(TiledMerger.class.getName()).log(Level.SEVERE, null, ex);
81 78
         }