upd: rename "My Points" to "Points" for consistency with support view.

Change-Id: I76efe755ff0d5cb8b66110fe92ec4b01f98acb10

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 6018849991e13ac454748d9b15b05e1a418b7da6..1c503666e338547faf69a208843d1fafbdea1a06 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -68,7 +68,7 @@ import org.cacert.gigi.pages.main.RegisterPage;
 import org.cacert.gigi.pages.orga.CreateOrgPage;
 import org.cacert.gigi.pages.orga.ViewOrgPage;
 import org.cacert.gigi.pages.wot.AssurePage;
-import org.cacert.gigi.pages.wot.MyPoints;
+import org.cacert.gigi.pages.wot.Points;
 import org.cacert.gigi.pages.wot.RequestTTPPage;
 import org.cacert.gigi.ping.PingerDaemon;
 import org.cacert.gigi.util.AuthorizationContext;
@@ -145,7 +145,7 @@ public final class Gigi extends HttpServlet {
             putPage(DomainOverview.PATH + "*", new DomainOverview(), "Certificates");
 
             putPage(AssurePage.PATH + "/*", new AssurePage(), "Web of Trust");
-            putPage(MyPoints.PATH, new MyPoints(false), "Web of Trust");
+            putPage(Points.PATH, new Points(false), "Web of Trust");
             putPage(RequestTTPPage.PATH, new RequestTTPPage(), "Web of Trust");
 
             putPage(TTPAdminPage.PATH + "/*", new TTPAdminPage(), "Admin");
@@ -170,7 +170,7 @@ public final class Gigi extends HttpServlet {
             putPage(UserTrainings.PATH, new UserTrainings(false), "My Account");
             putPage(MyDetails.PATH, new MyDetails(), "My Account");
             putPage(UserTrainings.SUPPORT_PATH, new UserTrainings(true), null);
-            putPage(MyPoints.SUPPORT_PATH, new MyPoints(true), null);
+            putPage(Points.SUPPORT_PATH, new Points(true), null);
 
             putPage(PasswordResetPage.PATH, new PasswordResetPage(), null);
             putPage(LogoutPage.PATH, new LogoutPage(), null);

diff --git a/src/org/cacert/gigi/pages/wot/MyPoints.java b/src/org/cacert/gigi/pages/wot/Points.java
similarity index 92%
rename from src/org/cacert/gigi/pages/wot/MyPoints.java
rename to src/org/cacert/gigi/pages/wot/Points.java
index 9d8a3e3bc0565651b5990faa0f125ed7b86ac7a0..453873524ed991af46464254eb094a2a00458d4a 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/MyPoints.java
+++ b/src/org/cacert/gigi/pages/wot/Points.java
@@ -11,11 +11,11 @@ import org.cacert.gigi.output.AssurancesDisplay;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.AuthorizationContext;
 
-public class MyPoints extends Page {
+public class Points extends Page {
 
     public static final String SUPPORT_PATH = "/support/user/*/points";
 
-    public static final String PATH = "/wot/mypoints";
+    public static final String PATH = "/wot/points";
 
     private static final int intStart = SUPPORT_PATH.indexOf('*');
 
@@ -25,8 +25,8 @@ public class MyPoints extends Page {
 
     private AssurancesDisplay toOtherDisplay;
 
-    public MyPoints(boolean support) {
-        super(support ? "Support User Points" : "My Points");
+    public Points(boolean support) {
+        super(support ? "Support User Points" : "Points");
         this.support = support;
         myDisplay = new AssurancesDisplay("asArr", false, support);
         toOtherDisplay = new AssurancesDisplay("otherAsArr", true, support);

diff --git a/src/org/cacert/gigi/pages/wot/MyPoints.templ b/src/org/cacert/gigi/pages/wot/Points.templ
similarity index 100%
rename from src/org/cacert/gigi/pages/wot/MyPoints.templ
rename to src/org/cacert/gigi/pages/wot/Points.templ

diff --git a/tests/org/cacert/gigi/pages/wot/TestAssurance.java b/tests/org/cacert/gigi/pages/wot/TestAssurance.java
index 915ede7f75ceaff11b6c7dcd935e54f896095383..7b622b7389a62579a9f4d043a8edae56b387015c 100644 (file)
--- a/tests/org/cacert/gigi/pages/wot/TestAssurance.java
+++ b/tests/org/cacert/gigi/pages/wot/TestAssurance.java
@@ -230,7 +230,7 @@ public class TestAssurance extends ManagedTest {
         execute("date=" + validVerificationDateString() + "&location=" + uniqueLoc + "&certify=1&rules=1&assertion=1&points=10");
 
         String cookie = login(assureeM, TEST_PASSWORD);
-        URLConnection url = get(cookie, MyPoints.PATH);
+        URLConnection url = get(cookie, Points.PATH);
         String resp = IOUtils.readURL(url);
         resp = resp.split(Pattern.quote("</table>"))[0];
         assertThat(resp, containsString(uniqueLoc));
@@ -241,7 +241,7 @@ public class TestAssurance extends ManagedTest {
         String uniqueLoc = createUniqueName();
         executeSuccess("date=" + validVerificationDateString() + "&location=" + uniqueLoc + "&certify=1&rules=1&assertion=1&points=10");
         String cookie = login(assurerM, TEST_PASSWORD);
-        URLConnection url = get(cookie, MyPoints.PATH);
+        URLConnection url = get(cookie, Points.PATH);
         String resp = IOUtils.readURL(url);
         resp = resp.split(Pattern.quote("</table>"))[1];
         assertThat(resp, containsString(uniqueLoc));