Removed unintended changes

Author: Chsudeepta

base/uk.ac.stfc.isis.ibex.configserver/src/uk/ac/stfc/isis/ibex/configserver/configuration/GlobalMacro.java

@@ -81,4 +81,31 @@ public int compareTo(GlobalMacro other) {
 		return 0;
 	}
 
+	@Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        GlobalMacro other = (GlobalMacro) obj;
+        if (this.name == null && other.name == null) {
+            return true;
+        }
+        if (this.name == null || other.name == null) {
+            return false;
+        }
+        return this.name.equals(other.name);
+    }
+
+    @Override
+    public int hashCode() {
+        return name == null ? 0 : name.hashCode();
+    }
+    
+    @Override
+	public String toString() {
+		return "GlobalMacro [name=" + name + ", macros=" + macros + "]";
+	}
 }

base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/editing/ConfigEditorPanel.java

@@ -125,7 +125,7 @@ public void widgetSelected(SelectionEvent e) {
 		setConfigToEdit(config);
 
 		if (!config.getGlobalmacros().isEmpty()) {
-			final GlobalMacroOverviewPanel globalMacros = new GlobalMacroOverviewPanel(editorTabs, SWT.NONE, config);
+			final GlobalMacroOverviewPanel globalMacros = new GlobalMacroOverviewPanel(editorTabs, config);
 			TabItem globalMacrosTab = new TabItem(editorTabs, SWT.NONE);
 			globalMacrosTab.setText("Global Macros");
 			globalMacrosTab.setControl(globalMacros);

base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/editing/macros/GlobalMacroOverviewPanel.java

@@ -45,10 +45,9 @@ public class GlobalMacroOverviewPanel extends Composite {
      * Constructor for the Macro panel.
      * 
      * @param parent The parent composite.
-     * @param style The SWT style.
      * @param config The configuration details.
      */
-	public GlobalMacroOverviewPanel(Composite parent, int style, EditableConfiguration config) {
+	public GlobalMacroOverviewPanel(Composite parent, EditableConfiguration config) {
 		super(parent, SWT.NONE);
 		setLayout(new FillLayout(SWT.HORIZONTAL));
 		table = new GlobalMacroTable(this, SWT.NONE, SWT.V_SCROLL | SWT.MULTI | SWT.FULL_SELECTION);