diff options
author | Claudia Knobloch | 2011-05-23 14:38:40 +0000 |
---|---|---|
committer | Claudia Knobloch | 2011-05-23 14:38:40 +0000 |
commit | 972b2797cb2718e00c3905489ad822627651d4c8 (patch) | |
tree | a2c40e64244f74e2e76cde7e78733d04b2670c1d | |
parent | 7bdb6820915e42bd1a3d2f14d5dd46ed871c2631 (diff) | |
download | org.eclipse.ptp-972b2797cb2718e00c3905489ad822627651d4c8.tar.gz org.eclipse.ptp-972b2797cb2718e00c3905489ad822627651d4c8.tar.xz org.eclipse.ptp-972b2797cb2718e00c3905489ad822627651d4c8.zip |
Update changes
3 files changed, 35 insertions, 34 deletions
diff --git a/rms/org.eclipse.ptp.rm.lml.core/src/org/eclipse/ptp/rm/lml/core/LMLManager.java b/rms/org.eclipse.ptp.rm.lml.core/src/org/eclipse/ptp/rm/lml/core/LMLManager.java index fdee7ee4f..b4915d1f4 100644 --- a/rms/org.eclipse.ptp.rm.lml.core/src/org/eclipse/ptp/rm/lml/core/LMLManager.java +++ b/rms/org.eclipse.ptp.rm.lml.core/src/org/eclipse/ptp/rm/lml/core/LMLManager.java @@ -226,13 +226,8 @@ public class LMLManager { return fLguiItem; } - private String getSelectedLguiTitle(int index) { - String[] lguis = LGUIS.keySet().toArray(new String[LGUIS.size()]); - return lguis[index]; - } - - public void selectLgui(int index) { - fLguiItem = LGUIS.get(getSelectedLguiTitle(index)); + public void selectLgui(String name) { + fLguiItem = LGUIS.get(name); fireSelectedLgui(); } diff --git a/rms/org.eclipse.ptp.rm.lml.ui/src/org/eclipse/ptp/rm/lml/ui/actions/UpdateLguiAction.java b/rms/org.eclipse.ptp.rm.lml.ui/src/org/eclipse/ptp/rm/lml/ui/actions/UpdateLguiAction.java index e43f0edf8..5fea4b896 100644 --- a/rms/org.eclipse.ptp.rm.lml.ui/src/org/eclipse/ptp/rm/lml/ui/actions/UpdateLguiAction.java +++ b/rms/org.eclipse.ptp.rm.lml.ui/src/org/eclipse/ptp/rm/lml/ui/actions/UpdateLguiAction.java @@ -12,6 +12,6 @@ public class UpdateLguiAction extends Action { @Override public void run() { - LMLManager.getInstance().update(); + LMLManager.getInstance().getRequestXml(); } } diff --git a/rms/org.eclipse.ptp.rm.lml.ui/src/org/eclipse/ptp/rm/lml/ui/views/LMLView.java b/rms/org.eclipse.ptp.rm.lml.ui/src/org/eclipse/ptp/rm/lml/ui/views/LMLView.java index 80726bcb9..67a61307a 100644 --- a/rms/org.eclipse.ptp.rm.lml.ui/src/org/eclipse/ptp/rm/lml/ui/views/LMLView.java +++ b/rms/org.eclipse.ptp.rm.lml.ui/src/org/eclipse/ptp/rm/lml/ui/views/LMLView.java @@ -22,7 +22,6 @@ package org.eclipse.ptp.rm.lml.ui.views; import java.util.ArrayList; -import java.util.Arrays; import java.util.Map; import java.util.List; @@ -30,7 +29,7 @@ import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; -import org.eclipse.jface.viewers.ArrayContentProvider; +import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.LabelProvider; @@ -44,7 +43,6 @@ import org.eclipse.ptp.rm.lml.core.events.IViewAddedEvent; import org.eclipse.ptp.rm.lml.core.events.IViewDisposedEvent; import org.eclipse.ptp.rm.lml.core.listeners.IViewListener; import org.eclipse.ptp.rm.lml.core.model.ILguiItem; -import org.eclipse.ptp.rm.lml.internal.core.model.LguiItem; import org.eclipse.ptp.rm.lml.ui.actions.AddLguiAction; import org.eclipse.ptp.rm.lml.ui.actions.RemoveLguiAction; import org.eclipse.ptp.rm.lml.ui.actions.ShowViewAction; @@ -73,7 +71,7 @@ public class LMLView extends ViewPart { public synchronized void handleEvent(ILguiAddedEvent e) { fSelected = e.getLguiItem(); lguis.add(fSelected); - viewer.refresh(); + createList(); } /* @@ -103,17 +101,24 @@ public class LMLView extends ViewPart { } -// public final class ListSelectionListener implements SelectionListener { -// public void widgetSelected(SelectionEvent e) { -// int selectedItem = list.getSelectionIndex(); -// lmlManager.selectLgui(selectedItem); -// } -// -// public void widgetDefaultSelected(SelectionEvent e) { -// lmlManager.selectLgui(0); -// } -// -// } + public final class ListSelectionListener implements SelectionListener { + public void widgetSelected(SelectionEvent e) { + + final IStructuredSelection selectionItem = (IStructuredSelection) viewer.getSelection(); + if (!selectionItem.equals(selection)) { + System.out.println("Here"); + selection = selectionItem; + lmlManager.selectLgui(selectionItem.toString()); + } + } + + public void widgetDefaultSelected(SelectionEvent e) { + final IStructuredSelection selectionItem = (IStructuredSelection) viewer.getSelection(); + selection = selectionItem; + lmlManager.selectLgui(selectionItem.toString()); + } + + } /** * @@ -126,9 +131,9 @@ public class LMLView extends ViewPart { private ILguiItem fSelected = null; private final LMLManager lmlManager = LMLManager.getInstance(); private LMLViewListener lmlViewListener = null; - private List list = null; -// private final ListSelectionListener listListener = new ListSelectionListener(); + private final ListSelectionListener listListener = new ListSelectionListener(); private List<ILguiItem> lguis = new ArrayList<ILguiItem>(); + private ISelection selection = null; private IMemento memento; @@ -148,7 +153,6 @@ public class LMLView extends ViewPart { viewer.setLabelProvider(new LabelProvider() { @Override public String getText(Object element) { -// System.out.println(((ILguiItem)element).toString()); return ((ILguiItem)element).toString(); } }); @@ -161,10 +165,6 @@ public class LMLView extends ViewPart { public Object[] getElements(Object inputElement) { ArrayList<ILguiItem> input = (ArrayList<ILguiItem>) inputElement; - System.out.println(input.size()); - for (ILguiItem item : input) { - System.out.println(item == null); - } return input.toArray(new ILguiItem[input.size()]); } }); @@ -176,10 +176,16 @@ public class LMLView extends ViewPart { } fSelected = lmlManager.getSelectedLguiItem(); - + createList(); + } + + private void createList() { createContextMenu(); viewer.setInput(lguis); - viewer.refresh(); + if (fSelected != null) { + viewer.setSelection(selection); + } + viewer.getList().addSelectionListener(listListener); } // private void restoreState() { @@ -226,9 +232,9 @@ public class LMLView extends ViewPart { manager.add(updateLguiAction); updateLguiAction.setEnabled(inContextForLgui); manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); - MenuManager subMenu = new MenuManager("Show View..."); + MenuManager subMenu = new MenuManager("Show Component..."); if (inContextForLgui) { - Map<String, String> gids = LMLManager.getInstance().getSelectedLguiItem().getLayoutAccess().getInactiveComponents(); + Map<String, String> gids = fSelected.getLayoutAccess().getInactiveComponents(); for (Map.Entry<String, String> gid : gids.entrySet()) { subMenu.add(new ShowViewAction(gid)); } |