Merge remote-tracking branch 'origin/master'

Author: ksidis

src/main/java/org/reactome/web/diagram/data/loader/GraphLoader.java

@@ -16,7 +16,8 @@ public interface Handler {
         void onGraphLoaderError(Throwable exception);
     }
 
-    private final static String PREFIX = DiagramFactory.SERVER + "/download/current/diagram/";
+    public static String PREFIX = DiagramFactory.SERVER + "/download/current/diagram/";
+    public static String SUFFIX = ".graph.json?v=" + LoaderManager.version;
 
     private Handler handler;
     private Request request;
@@ -32,7 +33,7 @@ public void cancel(){
     }
 
     public void load(String stId){
-        String url = PREFIX + stId + ".graph.json?v=" + LoaderManager.version;
+        String url = PREFIX + stId + SUFFIX;
         RequestBuilder requestBuilder = new RequestBuilder(RequestBuilder.GET, url);
         try {
             this.request = requestBuilder.sendRequest(null, this);

src/main/java/org/reactome/web/diagram/data/loader/LayoutLoader.java

@@ -16,7 +16,9 @@ public interface Handler {
         void onLayoutLoaderError(Throwable exception);
     }
 
-    private final static String PREFIX = DiagramFactory.SERVER + "/download/current/diagram/";
+    public static String PREFIX = DiagramFactory.SERVER + "/download/current/diagram/";
+    public static String SUFFIX = ".json?v=" + LoaderManager.version;
+
 
     private Handler handler;
     private Request request;
@@ -32,7 +34,7 @@ public void cancel(){
     }
 
     void load(String stId){
-        String url = PREFIX + stId + ".json?v=" + LoaderManager.version;
+        String url = PREFIX + stId + SUFFIX;
         RequestBuilder requestBuilder = new RequestBuilder(RequestBuilder.GET, url);
         try {
             this.request = requestBuilder.sendRequest(null, this);