Merge message still present - removed it

NCIEVS · Jul 6, 2023 · f8e0661 · f8e0661
1 parent 894543e
commit f8e0661
Showing 1 changed file with 0 additions and 40 deletions.
diff --git a/software/ncitbrowser/src/main/java/gov/nih/nci/evs/browser/utils/RemoteServerUtil.java b/software/ncitbrowser/src/main/java/gov/nih/nci/evs/browser/utils/RemoteServerUtil.java
@@ -91,25 +91,16 @@ public static LexBIGService createLexBIGService() {
             // _logger.error("\t-- trying to connect to " + url + " instead.");
             ex.printStackTrace();
         }
-<<<<<<< HEAD:software/ncitbrowser/src/java/gov/nih/nci/evs/browser/utils/RemoteServerUtil.java
-        if (activate_server_monitor_thread) ServerMonitorThread.getInstance().monitor(null, "createLexBIGService");
-        return null;
-=======
         return null;
         //if (activate_server_monitor_thread) ServerMonitorThread.getInstance().monitor(null, "createLexBIGService");
         //return null;// createLexBIGService(url);
->>>>>>> 2022-07-29-v2.19-branch:software/ncitbrowser/src/main/java/gov/nih/nci/evs/browser/utils/RemoteServerUtil.java
     }
 
     public static LexBIGService createLexBIGService(String serviceUrl) {
 //        try {
             NCItBrowserProperties properties = null;
-<<<<<<< HEAD:software/ncitbrowser/src/java/gov/nih/nci/evs/browser/utils/RemoteServerUtil.java
-            if (serviceUrl == null || serviceUrl.compareTo("") == 0 || serviceUrl.compareToIgnoreCase("null") == 0) {
-=======
 
 //            if (serviceUrl == null || serviceUrl.compareTo("") == 0 || serviceUrl.compareToIgnoreCase("null") == 0) {
->>>>>>> 2022-07-29-v2.19-branch:software/ncitbrowser/src/main/java/gov/nih/nci/evs/browser/utils/RemoteServerUtil.java
 				try {
 					properties = NCItBrowserProperties.getInstance();
 					String lg_config_file =
@@ -302,21 +293,6 @@ public static LexBIGService createLexBIGService(String serviceUrl,
 
 
 
-<<<<<<< HEAD:software/ncitbrowser/src/java/gov/nih/nci/evs/browser/utils/RemoteServerUtil.java
-    public static LexEVSDistributed getLexEVSDistributed() {
-		String url = null;
-		NCItBrowserProperties properties = null;
-		try {
-            properties = NCItBrowserProperties.getInstance();
-            url = properties.getProperty(NCItBrowserProperties.EVS_SERVICE_URL);
-            return getLexEVSDistributed(url);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-        if (activate_server_monitor_thread) ServerMonitorThread.getInstance().monitor(null, "getLexEVSDistributed");
-        return null;
-	}
-=======
 //    public static LexEVSDistributed getLexEVSDistributed() {
 //		String url = null;//"http://ncias-d499-v:29780/lexevsapi61";
 //		NCItBrowserProperties properties = null;
@@ -330,7 +306,6 @@ public static LexEVSDistributed getLexEVSDistributed() {
 //        if (activate_server_monitor_thread) ServerMonitorThread.getInstance().monitor(null, "getLexEVSDistributed");
 //        return null;
 //	}
->>>>>>> 2022-07-29-v2.19-branch:software/ncitbrowser/src/main/java/gov/nih/nci/evs/browser/utils/RemoteServerUtil.java
 
 
 //    public static LexEVSDistributed getLexEVSDistributed(String serviceUrl) {
@@ -353,20 +328,6 @@ public static LexEVSValueSetDefinitionServices getLexEVSValueSetDefinitionServic
 	}
 
     public static LexEVSValueSetDefinitionServices getLexEVSValueSetDefinitionServices(String serviceUrl) {
-<<<<<<< HEAD:software/ncitbrowser/src/java/gov/nih/nci/evs/browser/utils/RemoteServerUtil.java
-		if (serviceUrl == null || serviceUrl.compareTo("") == 0 || serviceUrl.compareToIgnoreCase("null") == 0) {
-			NCItBrowserProperties properties = null;
-			try {
-				NCItBrowserProperties.getInstance();
-				String lg_config_file =
-					properties
-						.getProperty(NCItBrowserProperties.LG_CONFIG_FILE);
-				System.setProperty(NCItBrowserProperties.LG_CONFIG_FILE,
-					lg_config_file);
-			} catch (Exception ex) {
-				ex.printStackTrace();
-			}
-=======
 		//if (serviceUrl == null || serviceUrl.compareTo("") == 0 || serviceUrl.compareToIgnoreCase("null") == 0) {
                 NCItBrowserProperties properties = null;
                 try {
@@ -379,7 +340,6 @@ public static LexEVSValueSetDefinitionServices getLexEVSValueSetDefinitionServic
 				} catch (Exception ex) {
 					ex.printStackTrace();
 				}
->>>>>>> 2022-07-29-v2.19-branch:software/ncitbrowser/src/main/java/gov/nih/nci/evs/browser/utils/RemoteServerUtil.java
 
 			return LexEVSValueSetDefinitionServicesImpl.defaultInstance();
 		//}