Commit ad72e84b authored by Matija Obreza's avatar Matija Obreza
Browse files

Fixed issues after merge

parent eb9237eb
......@@ -149,13 +149,12 @@
<artifactId>json</artifactId>
<version>20090211</version>
</dependency>
</dependencies>
<dependency>
<groupId>org.genesys2</groupId>
<artifactId>client-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencies>
<build>
<plugins>
......
......@@ -51,6 +51,7 @@ import org.eclipse.swt.widgets.*;
import org.eclipse.wb.swt.SWTResourceManager;
import org.genesys2.anno.model.ColumnDef;
import org.genesys2.anno.model.Settings;
import org.json.JSONException;
import swing2swt.layout.BorderLayout;
......@@ -481,7 +482,7 @@ public class AppWindow {
saveWorkSpace.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
saveWorkSpace();
doSaveWorkSpace();
}
});
saveWorkSpace.setText("Save workspace");
......@@ -490,7 +491,7 @@ public class AppWindow {
loadWorkSpace.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
loadWorkSpace();
doLoadWorkSpace();
}
});
loadWorkSpace.setText("Load workspace");
......@@ -507,7 +508,7 @@ public class AppWindow {
m_bindingContext = initDataBindings();
}
private void saveWorkSpace() {
private void doSaveWorkSpace() {
FileDialog dialog = new FileDialog(shlGenesysMagic, SWT.SAVE);
dialog.setFilterNames(new String[]{"JSON Format"});
dialog.setFilterExtensions(new String[]{"*.json"});
......@@ -525,7 +526,7 @@ public class AppWindow {
}
}
private void loadWorkSpace() {
private void doLoadWorkSpace() {
FileDialog dialog = new FileDialog(shlGenesysMagic, SWT.MULTI);
dialog.setFilterNames(new String[]{"JSON Format"});
dialog.setFilterExtensions(new String[]{"*.json"});
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment