Merge

Alexander Lippling · Alexander Lippling · commit b4b970ab039b · 2012-06-15T12:53:52.000+02:00
Change-Id: Ib074514c51f3764c0e0f915af1e6914159274333
diff --git a/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/Plist.java b/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/Plist.java
@@ -20,7 +20,8 @@
 package com.sap.prd.mobile.ios.mios.xcodeprojreader;
 
 /**
- * The Plist root object. An Xcode project file for example uses the plist format to store its information.
+ * The Plist root object. An Xcode project file for example uses the plist format to store its
+ * information.
  */
 public interface Plist
 {
diff --git a/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/buildphases/PBXAppleScriptBuildPhase.java b/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/buildphases/PBXAppleScriptBuildPhase.java
@@ -24,8 +24,6 @@
 
 public class PBXAppleScriptBuildPhase extends BuildPhase
 {
-  public static final String isa = "PBXAppleScriptBuildPhase"; // unconfirmed
-
   public PBXAppleScriptBuildPhase(ProjectFile projectFile)
   {
     this(projectFile, projectFile.createDict());
diff --git a/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/buildphases/PBXCopyFilesBuildPhase.java b/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/buildphases/PBXCopyFilesBuildPhase.java
@@ -24,8 +24,6 @@
 
 public class PBXCopyFilesBuildPhase extends BuildPhase
 {
-  public static final String isa = "PBXCopyFilesBuildPhase";
-
   public PBXCopyFilesBuildPhase(ProjectFile projectFile)
   {
     this(projectFile, projectFile.createDict());
diff --git a/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/buildphases/PBXFrameworksBuildPhase.java b/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/buildphases/PBXFrameworksBuildPhase.java
@@ -24,8 +24,6 @@
 
 public class PBXFrameworksBuildPhase extends BuildPhase
 {
-  public static final String isa = "PBXFrameworksBuildPhase";
-
   public PBXFrameworksBuildPhase(ProjectFile projectFile)
   {
     this(projectFile, projectFile.createDict());
diff --git a/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/buildphases/PBXHeadersBuildPhase.java b/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/buildphases/PBXHeadersBuildPhase.java
@@ -24,8 +24,6 @@
 
 public class PBXHeadersBuildPhase extends BuildPhase
 {
-  public static final String isa = "PBXHeadersBuildPhase";
-
   public PBXHeadersBuildPhase(ProjectFile projectFile)
   {
     this(projectFile, projectFile.createDict());
diff --git a/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/buildphases/PBXResourcesBuildPhase.java b/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/buildphases/PBXResourcesBuildPhase.java
@@ -24,8 +24,6 @@
 
 public class PBXResourcesBuildPhase extends BuildPhase
 {
-  public static final String isa = "PBXResourcesBuildPhase";
-
   public PBXResourcesBuildPhase(ProjectFile projectFile)
   {
     this(projectFile, projectFile.createDict());
diff --git a/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/buildphases/PBXShellScriptBuildPhase.java b/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/buildphases/PBXShellScriptBuildPhase.java
@@ -27,7 +27,7 @@
 
 public class PBXShellScriptBuildPhase extends BuildPhase
 {
-  public static final String isa = "PBXShellScriptBuildPhase";
+  public static final String isa = PBXShellScriptBuildPhase.class.getSimpleName();
 
   public PBXShellScriptBuildPhase(ProjectFile projectFile)
   {
diff --git a/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/buildphases/PBXSourcesBuildPhase.java b/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/buildphases/PBXSourcesBuildPhase.java
@@ -24,8 +24,6 @@
 
 public class PBXSourcesBuildPhase extends BuildPhase
 {
-  public static final String isa = "PBXSourcesBuildPhase";
-
   public PBXSourcesBuildPhase(ProjectFile projectFile)
   {
     this(projectFile, projectFile.createDict());
diff --git a/src/test/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/TargetTest.java b/src/test/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/TargetTest.java
@@ -51,8 +51,8 @@ public void buildPhases()
   {
     ReferenceArray<BuildPhase> buildPhases = target.getBuildPhases();
     assertEquals(3, buildPhases.size());
-    assertEquals(PBXSourcesBuildPhase.isa, buildPhases.get(0).getIsA());
-    assertEquals(PBXFrameworksBuildPhase.isa, buildPhases.get(1).getIsA());
-    assertEquals(PBXResourcesBuildPhase.isa, buildPhases.get(2).getIsA());
+    assertEquals(PBXSourcesBuildPhase.class.getSimpleName(), buildPhases.get(0).getIsA());
+    assertEquals(PBXFrameworksBuildPhase.class.getSimpleName(), buildPhases.get(1).getIsA());
+    assertEquals(PBXResourcesBuildPhase.class.getSimpleName(), buildPhases.get(2).getIsA());
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,8 @@`
`20`	`20`	`package com.sap.prd.mobile.ios.mios.xcodeprojreader;`
`21`	`21`
`22`	`22`	`/**`
`23`		`- * The Plist root object. An Xcode project file for example uses the plist format to store its information.`
	`23`	`+ * The Plist root object. An Xcode project file for example uses the plist format to store its`
	`24`	`+ * information.`
`24`	`25`	`*/`
`25`	`26`	`public interface Plist`
`26`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,6 @@`
`24`	`24`
`25`	`25`	`public class PBXAppleScriptBuildPhase extends BuildPhase`
`26`	`26`	`{`
`27`		`- public static final String isa = "PBXAppleScriptBuildPhase"; // unconfirmed`
`28`		`-`
`29`	`27`	`public PBXAppleScriptBuildPhase(ProjectFile projectFile)`
`30`	`28`	`{`
`31`	`29`	`this(projectFile, projectFile.createDict());`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`
`28`	`28`	`public class PBXShellScriptBuildPhase extends BuildPhase`
`29`	`29`	`{`
`30`		`- public static final String isa = "PBXShellScriptBuildPhase";`
	`30`	`+ public static final String isa = PBXShellScriptBuildPhase.class.getSimpleName();`
`31`	`31`
`32`	`32`	`public PBXShellScriptBuildPhase(ProjectFile projectFile)`
`33`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,8 @@ public void buildPhases()`
`51`	`51`	`{`
`52`	`52`	`ReferenceArray<BuildPhase> buildPhases = target.getBuildPhases();`
`53`	`53`	`assertEquals(3, buildPhases.size());`
`54`		`- assertEquals(PBXSourcesBuildPhase.isa, buildPhases.get(0).getIsA());`
`55`		`- assertEquals(PBXFrameworksBuildPhase.isa, buildPhases.get(1).getIsA());`
`56`		`- assertEquals(PBXResourcesBuildPhase.isa, buildPhases.get(2).getIsA());`
	`54`	`+ assertEquals(PBXSourcesBuildPhase.class.getSimpleName(), buildPhases.get(0).getIsA());`
	`55`	`+ assertEquals(PBXFrameworksBuildPhase.class.getSimpleName(), buildPhases.get(1).getIsA());`
	`56`	`+ assertEquals(PBXResourcesBuildPhase.class.getSimpleName(), buildPhases.get(2).getIsA());`
`57`	`57`	`}`
`58`	`58`	`}`