GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-25 10:48:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix the history management in the editor

Browse Source
This commit is contained in:
krasimir
2010-11-07 16:17:15 +00:00
parent 0c8944781b
commit c1d91b7f50
2 changed files with 47 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/BrowsePanel.java
View File

@@ -65,7 +65,7 @@ public class BrowsePanel extends Composite {
private static void callBrowse(BrowsePanel panel, String id) { private static void callBrowse(BrowsePanel panel, String id) {
panel.browse(id); panel.browse(id);
History.newItem("browse:"+id); History.newItem("browse:"+id, false);
} }
public void browse(final String id) { public void browse(final String id) {

83
src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/EditorApp.java
View File

@@ -226,8 +226,6 @@ public class EditorApp implements EntryPoint {
vPanel.add(hPanel); vPanel.add(hPanel);
vPanel.add(editorPanel); vPanel.add(editorPanel);
History.addHistoryListener(new MyHistoryListener(linksPanel));
return vPanel; return vPanel;
} }
@@ -325,7 +323,27 @@ public class EditorApp implements EntryPoint {
tabBar.addTab("Query"); tabBar.addTab("Query");
tabBar.addTab("Browse"); tabBar.addTab("Browse");
tabBar.addSelectionHandler(new SelectionHandler<Integer>() { NavigationHandler handler = new NavigationHandler(tabBar, parent);
tabBar.addSelectionHandler(handler);
History.addHistoryListener(handler);
return tabBar;
}
//
// History stuff
//
protected class NavigationHandler implements HistoryListener, SelectionHandler<Integer> {
private final TabBar linksPanel;
private final Panel parent;
private int level = 0;
public NavigationHandler(TabBar linksPanel, Panel parent) {
this.linksPanel = linksPanel;
this.parent = parent;
}
public void onSelection(SelectionEvent<Integer> event) { public void onSelection(SelectionEvent<Integer> event) {
parent.remove(documentsPanel); parent.remove(documentsPanel);
parent.remove(editorPanel); parent.remove(editorPanel);
@@ -333,40 +351,24 @@ public class EditorApp implements EntryPoint {
parent.remove(browsePanel); parent.remove(browsePanel);
switch (event.getSelectedItem().intValue()) { switch (event.getSelectedItem().intValue()) {
case 0: parent.add(documentsPanel); History.newItem("documents"); break; case 0: parent.add(documentsPanel);
case 1: parent.add(editorPanel); History.newItem("editor"); break; if (level == 0) History.newItem("documents", false);
case 2: parent.add(queryPanel); History.newItem("query"); break; break;
case 3: parent.add(browsePanel); History.newItem("browse"); break; case 1: parent.add(editorPanel);
if (level == 0) History.newItem("editor", false);
break;
case 2: parent.add(queryPanel);
if (level == 0) History.newItem("query", false);
break;
case 3: parent.add(browsePanel);
if (level == 0) History.newItem("browse", false);
break;
} }
} }
});
return tabBar;
}
protected Widget createErrorMsg(final PGF.TcError error) {
HTML msgHTML = new HTML("<pre>"+error.getMsg()+"</pre>");
msgHTML.addStyleName("content");
msgHTML.addClickListener(new ClickListener() {
public void onClick(Widget sender) {
textPanel.showError(error.getFId());
}
});
return msgHTML;
}
//
// History stuff
//
protected class MyHistoryListener implements HistoryListener {
private final TabBar linksPanel;
public MyHistoryListener(TabBar linksPanel) {
this.linksPanel = linksPanel;
}
public void onHistoryChanged(String token) { public void onHistoryChanged(String token) {
level++;
if (token.equals("documents")) { if (token.equals("documents")) {
linksPanel.selectTab(0); linksPanel.selectTab(0);
} else if (token.equals("editor")) { } else if (token.equals("editor")) {
@@ -378,12 +380,25 @@ public class EditorApp implements EntryPoint {
browsePanel.onActivate(); browsePanel.onActivate();
browsePanel.browse(null); browsePanel.browse(null);
} else if (token.startsWith("browse:")) { } else if (token.startsWith("browse:")) {
linksPanel.selectTab(4); linksPanel.selectTab(3);
browsePanel.browse(token.substring(7)); browsePanel.browse(token.substring(7));
} }
level--;
} }
}; };
protected Widget createErrorMsg(final PGF.TcError error) {
HTML msgHTML = new HTML("<pre>"+error.getMsg()+"</pre>");
msgHTML.addStyleName("content");
msgHTML.addClickListener(new ClickListener() {
public void onClick(Widget sender) {
textPanel.showError(error.getFId());
}
});
return msgHTML;
}
protected void setPGFName (String pgfName) { protected void setPGFName (String pgfName) {
if (pgfName != null && !pgfName.equals(pgf.getPGFName())) { if (pgfName != null && !pgfName.equals(pgf.getPGFName())) {
pgf.setPGFName(pgfName); pgf.setPGFName(pgfName);