Revision: 15586
Author: pavel.slegr
Date: Wed Dec 1 04:41:40 2010
Log: fix ReleaseType comparator
http://code.google.com/p/mobicents/source/detail?r=15586
Modified:
/tools/productization/branches/trackertool_thin/trackertool-core/src/main/java/org/mobicents/gcode/trackertool/roadmap/RoadmapCategories.java
/tools/productization/branches/trackertool_thin/trackertool-core/src/main/java/org/mobicents/gcode/trackertool/roadmap/RoadmapEntryComparatorImpl.java
/tools/productization/branches/trackertool_thin/trackertool-core/src/main/java/org/mobicents/gcode/trackertool/roadmap/RoadmapMaker.java
/tools/productization/branches/trackertool_thin/trackertool-core/src/test/java/org/mobicents/gcode/trackertool/roadmap/RoadmapReleaseTypeComparatorImplTest.java
=======================================
---
/tools/productization/branches/trackertool_thin/trackertool-core/src/main/java/org/mobicents/gcode/trackertool/roadmap/RoadmapCategories.java
Mon Nov 1 07:47:48 2010
+++
/tools/productization/branches/trackertool_thin/trackertool-core/src/main/java/org/mobicents/gcode/trackertool/roadmap/RoadmapCategories.java
Wed Dec 1 04:41:40 2010
@@ -133,6 +133,10 @@
enum RoadmapReleaseTypesOrder {
Release_Type_Alpha, // = Indicates Alpha release/milestone
+ Release_Type_Alpha_2, // = Indicates Alpha release/milestone
+ Release_Type_Alpha_3, // = Indicates Alpha release/milestone
+ Release_Type_Alpha_4, // = Indicates Alpha release/milestone
+ Release_Type_Alpha_5, // = Indicates Alpha release/milestone
Release_Type_Beta, // = Indicates Beta release/milestone
Release_Type_Beta_2, // = Indicates Beta2 release/milestone
Release_Type_Beta_3, // = Indicates Beta3 release/milestone
@@ -153,36 +157,44 @@
switch (roadmapReleaseTypesOrder) {
case Release_Type_Alpha:
return 1;
- case Release_Type_Beta:
+ case Release_Type_Alpha_2:
return 2;
- case Release_Type_Beta_2:
+ case Release_Type_Alpha_3:
return 3;
- case Release_Type_Beta_3:
+ case Release_Type_Alpha_4:
return 4;
- case Release_Type_Beta_4:
+ case Release_Type_Alpha_5:
return 5;
- case Release_Type_Beta_5:
+ case Release_Type_Beta:
return 6;
- case Release_Type_Beta_6:
+ case Release_Type_Beta_2:
return 7;
- case Release_Type_Beta_7:
+ case Release_Type_Beta_3:
return 8;
- case Release_Type_Beta_8:
+ case Release_Type_Beta_4:
return 9;
- case Release_Type_Beta_9:
+ case Release_Type_Beta_5:
return 10;
- case Release_Type_Candidate:
+ case Release_Type_Beta_6:
return 11;
- case Release_Type_Candidate_2:
+ case Release_Type_Beta_7:
return 12;
- case Release_Type_Candidate_3:
+ case Release_Type_Beta_8:
return 13;
- case Release_Type_Candidate_4:
+ case Release_Type_Beta_9:
return 14;
- case Release_Type_GA:
+ case Release_Type_Candidate:
return 15;
- case Release_Type_FINAL:
+ case Release_Type_Candidate_2:
return 16;
+ case Release_Type_Candidate_3:
+ return 17;
+ case Release_Type_Candidate_4:
+ return 18;
+ case Release_Type_GA:
+ return 19;
+ case Release_Type_FINAL:
+ return 20;
}
return 0;
}
@@ -205,11 +217,29 @@
return false;
}
+ public static RoadmapReleaseTypesOrder getEnumForShort (String
name) {
+ RoadmapReleaseTypesOrder[] names_ =
RoadmapReleaseTypesOrder.values();
+ for (int i = 0; i < names_.length; i++) {
+ String name_ =
RoadmapReleaseTypesOrder.getShortName(RoadmapReleaseTypesOrder.valueOf(names_[i].name()));
+ if(name.equals(name_)) return names_[i];
+ }
+ return null;
+ }
+
+
public static String getShortName(RoadmapReleaseTypesOrder
roadmapReleaseTypesOrder){
switch (roadmapReleaseTypesOrder) {
case Release_Type_Alpha:
return "ALPHA";
+ case Release_Type_Alpha_2:
+ return "ALPHA2";
+ case Release_Type_Alpha_3:
+ return "ALPHA3";
+ case Release_Type_Alpha_4:
+ return "ALPHA4";
+ case Release_Type_Alpha_5:
+ return "ALPHA5";
case Release_Type_Beta:
return "BETA1";
case Release_Type_Beta_2:
@@ -243,8 +273,6 @@
}
return "";
}
-
-
}
}
=======================================
---
/tools/productization/branches/trackertool_thin/trackertool-core/src/main/java/org/mobicents/gcode/trackertool/roadmap/RoadmapEntryComparatorImpl.java
Mon Oct 18 07:06:39 2010
+++
/tools/productization/branches/trackertool_thin/trackertool-core/src/main/java/org/mobicents/gcode/trackertool/roadmap/RoadmapEntryComparatorImpl.java
Wed Dec 1 04:41:40 2010
@@ -1,21 +1,53 @@
package org.mobicents.gcode.trackertool.roadmap;
+import org.apache.log4j.Logger;
+import
org.mobicents.gcode.trackertool.roadmap.RoadmapCategories.RoadmapReleaseTypesOrder;
+
public class RoadmapEntryComparatorImpl implements RoadmapEntryComparator{
+
+ static Logger logger =
Logger.getLogger(RoadmapEntryComparatorImpl.class);
public int compare(RoadmapEntry o1, RoadmapEntry o2) {
// TODO Auto-generated method stub
-
- String o1_version = o1.getVersion();
- String o1_releaseType = o1.getRelease_type();
- String o2_version = o2.getVersion();
- String o2_releaseType = o2.getRelease_type();
+
+ String o1_version;
+ String o1_releaseType;
+ String o2_version;
+ String o2_releaseType;
+
+ if(o1.getRoadmapID() != null){
+ o1_version = o1.getRoadmapID().getVersion();
+ o1_version = "Version-"+o1_version;
+ o1_releaseType = o1.getRoadmapID().getReleaseType();
+ o1_releaseType =
RoadmapReleaseTypesOrder.getEnumForShort(o1_releaseType).name();
+ }
+ else {
+ o1_version = o1.getVersion();
+ o1_releaseType = o1.getRelease_type();
+ }
+
+ if(o2.getRoadmapID() != null){
+ o2_version = o2.getRoadmapID().getVersion();
+ o2_releaseType = o2.getRoadmapID().getReleaseType();
+ o2_releaseType = o2.getRoadmapID().getReleaseType();
+ o2_releaseType =
RoadmapReleaseTypesOrder.getEnumForShort(o2_releaseType).name();
+ }
+ else {
+ o2_version = o2.getVersion();
+ o2_releaseType = o2.getRelease_type();
+ }
+
+
+ logger.debug("COMPARE >> " + o1.getComponent() + ":" + o1_version + ":"
+ o1_releaseType + " >with< " + o2.getComponent() + ":" + o2_version + ":"
+ o2_releaseType);
// Compare versions first
int version_compare = new
RoadmapVersionComparatorImpl().compare(o1_version, o2_version);
+ logger.debug("version_compare: " + version_compare);
if(version_compare == 0){
int releaseType_compare = new
RoadmapReleaseTypeComparatorImpl().compare(o1_releaseType, o2_releaseType);
+ logger.debug("releaseType_compare: " +
releaseType_compare);
return releaseType_compare;
}
else {
=======================================
---
/tools/productization/branches/trackertool_thin/trackertool-core/src/main/java/org/mobicents/gcode/trackertool/roadmap/RoadmapMaker.java
Mon Nov 1 07:47:48 2010
+++
/tools/productization/branches/trackertool_thin/trackertool-core/src/main/java/org/mobicents/gcode/trackertool/roadmap/RoadmapMaker.java
Wed Dec 1 04:41:40 2010
@@ -13,7 +13,6 @@
public static void main(String[] args) {
- try {
//BasicConfigurator.configure();
// Read properties file.
Properties properties = new Properties();
@@ -25,9 +24,6 @@
System.out.println("URL of log4j properties: " +
properties);
PropertyConfigurator.configure(properties);
new RoadmapBuilder().buildRoadmap();
- } catch (Exception e) {
- e.printStackTrace();
- }
}
}
=======================================
---
/tools/productization/branches/trackertool_thin/trackertool-core/src/test/java/org/mobicents/gcode/trackertool/roadmap/RoadmapReleaseTypeComparatorImplTest.java
Mon Oct 18 07:06:39 2010
+++
/tools/productization/branches/trackertool_thin/trackertool-core/src/test/java/org/mobicents/gcode/trackertool/roadmap/RoadmapReleaseTypeComparatorImplTest.java
Wed Dec 1 04:41:40 2010
@@ -21,12 +21,16 @@
release.add("Release_Type_Candidate_3");
release.add("Release_Type_GA");
release.add("Release_Type_Beta_6");
+ release.add("Release_Type_FINAL");
+ release.add("Release_Type_Alpha_2");
release.add("Release_Type_Beta");
+ releaseCompare.add("Release_Type_Alpha_2");
releaseCompare.add("Release_Type_Beta");
releaseCompare.add("Release_Type_Beta_6");
releaseCompare.add("Release_Type_Candidate_3");
releaseCompare.add("Release_Type_GA");
+ releaseCompare.add("Release_Type_FINAL");
categories.setReleases(release);