Renamed the Code dx to Srm in the Resource and help folder

Author: splahoti12

addOns/srm/src/main/java/org/zaproxy/zap/extension/srm/SrmExtension.java

@@ -20,6 +20,7 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.net.URI;
 import java.nio.file.Paths;
 import java.security.GeneralSecurityException;
 
@@ -115,7 +116,7 @@ public CloseableHttpClient getHttpClient(String url) throws IOException, General
         RequestConfig config = RequestConfig.custom().setConnectTimeout(getTimeout()).setSocketTimeout(getTimeout())
                 .setConnectionRequestTimeout(getTimeout()).build();
         return HttpClientBuilder.create()
-                .setSSLSocketFactory(SSLConnectionSocketFactoryFactory.getFactory(new URL(url).getHost(), this))
+                .setSSLSocketFactory(SSLConnectionSocketFactoryFactory.getFactory(URI.create(url).getHost(), this))
                 .setDefaultRequestConfig(config).build();
     }
 
@@ -129,7 +130,7 @@ public CloseableHttpClient getHttpClient(
         return HttpClientBuilder.create()
                 .setSSLSocketFactory(
                     SSLConnectionSocketFactoryFactory.getFactory(
-                            new URL(url).getHost(), this, fingerprint, acceptPermanently
+                            URI.create(url).getHost(), this, fingerprint, acceptPermanently
                     )
                 ).setDefaultRequestConfig(config).build();
     }

addOns/srm/src/main/java/org/zaproxy/zap/extension/srm/SrmProperties.java

@@ -45,6 +45,7 @@ private SrmProperties(){
 	private static final Logger LOGGER = LogManager.getLogger(SrmProperties.class);
 
 	private static final String PROP_FILE = "srm.properties";
+	private static final String FALLBACK_PROP_FILE = "codedx.properties";
 	private static final String KEY_SERVER = "serverUrl";
 	private static final String KEY_API = "apiKey";
 	private static final String KEY_SELECTED = "selectedId";
@@ -97,10 +98,16 @@ private void loadProperties(){
 
 		File f = Paths.get(Constant.getZapHome(), PROP_FILE).toFile();
 		if(!f.exists()){
-			try {
-				f.createNewFile();
-			} catch (IOException e) {
-				LOGGER.error("Error creating srm.properties file: ", e);
+			// Try fallback
+			File fallback = Paths.get(Constant.getZapHome(), FALLBACK_PROP_FILE).toFile();
+			if (fallback.exists()) {
+				f = fallback;
+			} else {
+				try {
+					f.createNewFile();
+				} catch (IOException e) {
+					LOGGER.error("Error creating srm.properties file: ", e);
+				}
 			}
 		}
 
@@ -112,7 +119,8 @@ private void loadProperties(){
 			}
 		}
 	}
-	
+
+
 	private void saveProperties(){		
 		File f = Paths.get(Constant.getZapHome(), PROP_FILE).toFile();
 		try(FileOutputStream out = new FileOutputStream(f)){

addOns/srm/src/main/java/org/zaproxy/zap/extension/srm/UploadPropertiesDialog.java

@@ -42,7 +42,6 @@
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.SwingConstants;
-import java.net.URL;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
@@ -163,10 +162,10 @@ private JComboBox<NameValuePair> createProjectComboBox(Container cont){
 		JButton refresh = new JButton(REFRESH_ICON);
 		refresh.setPreferredSize(new Dimension(REFRESH_ICON.getIconHeight()+6,REFRESH_ICON.getIconHeight()+6));
 		refresh.addActionListener(e -> {
-			if ("".equals(serverUrl.getText()) || "".equals(apiKey.getText())) {
-				error(Constant.messages.getString("srm.error.required"));
-				return;
-			}
+				if ("".equals(serverUrl.getText()) || "".equals(apiKey.getText())) {
+					error(Constant.messages.getString("srm.error.required"));
+					return;
+				}
 				dialog.setCursor(new Cursor(Cursor.WAIT_CURSOR));
 				updateProjects();
 				dialog.setCursor(Cursor.getDefaultCursor());