import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PlatformUI;
import org.netxms.client.NXCSession;
import org.netxms.client.SessionListener;
import org.netxms.client.SessionNotification;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.PlatformUI;
import org.netxms.client.NXCSession;
import org.netxms.client.datacollection.ConditionDciInfo;
import org.netxms.client.datacollection.DataCollectionObject;
private long dciId = 0;
private String configId;
private String objectName = null;
- private String id;
private Table currentData = null;
private SortableTableViewer viewer;
+ private TableLabelProvider labelProvider;
private CLabel errorLabel;
private CellSelectionManager cellSelectionManager;
private Action actionShowLineChart;
private Action actionShowBarChart;
private Action actionShowPieChart;
private Action actionUseMultipliers;
- private boolean useMultipliers = false;
- private TableLabelProvider tlp;
/**
* @param parent
* @param style
* @param viewPart
*/
- public TableValue(Composite parent, int style, IViewPart viewPart, String configId)
+ public TableValue(Composite parent, int style, IViewPart viewPart, String configSubId)
{
super(parent, style);
this.viewPart = viewPart;
- this.configId = configId;
session = (NXCSession)ConsoleSharedData.getSession();
setLayout(new FormLayout());
viewer = new SortableTableViewer(this, SWT.FULL_SELECTION | SWT.MULTI);
viewer.setContentProvider(new TableContentProvider());
- viewer.setLabelProvider(new TableLabelProvider());
+ labelProvider = new TableLabelProvider();
+ viewer.setLabelProvider(labelProvider);
cellSelectionManager = new CellSelectionManager(viewer);
- final IDialogSettings ds = Activator.getDefault().getDialogSettings();
- tlp = (TableLabelProvider)viewer.getLabelProvider();
-
FormData fd = new FormData();
fd.top = new FormAttachment(0, 0);
fd.left = new FormAttachment(0, 0);
fd.bottom = new FormAttachment(100, 0);
viewer.getControl().setLayoutData(fd);
- createActions();
- createPopupMenu();
-
StringBuilder sb = new StringBuilder("TableLastValues."); //$NON-NLS-1$
sb.append(dciId);
- if (configId != null)
+ if (configSubId != null)
{
sb.append('.');
- sb.append(configId);
+ sb.append(configSubId);
}
- id = sb.toString();
+ configId = sb.toString();
- if (ds.get(id + ".useMultipliers") != null) {//$NON-NLS-1$
- useMultipliers = ds.getBoolean(id + ".useMultipliers");
- }
- else
- tlp.useMultipliers(useMultipliers);
+ final IDialogSettings ds = Activator.getDefault().getDialogSettings();
+ if (ds.get(configId + ".useMultipliers") != null)
+ labelProvider.setUseMultipliers(ds.getBoolean(configId + ".useMultipliers"));
+
+ createActions();
+ createPopupMenu();
}
/**
@Override
public void run()
{
- useMultipliers();
+ labelProvider.setUseMultipliers(actionUseMultipliers.isChecked());
+ viewer.refresh(true);
}
};
+ actionUseMultipliers.setChecked(labelProvider.areMultipliersUsed());
}
/**
Arrays.fill(widths, 150);
viewer.createColumns(names, widths, 0, SWT.UP);
-
-
- WidgetHelper.restoreTableViewerSettings(viewer, Activator.getDefault().getDialogSettings(), id); //$NON-NLS-1$
+ WidgetHelper.restoreTableViewerSettings(viewer, Activator.getDefault().getDialogSettings(), configId); //$NON-NLS-1$
viewer.getTable().addDisposeListener(new DisposeListener() {
@Override
public void widgetDisposed(DisposeEvent e)
{
- WidgetHelper.saveTableViewerSettings(viewer, Activator.getDefault().getDialogSettings(), id); //$NON-NLS-1$
- ds.put(id + ".useMultipliers", tlp.areMultipliersUsed()); //$NON-NLS-1$
+ WidgetHelper.saveTableViewerSettings(viewer, Activator.getDefault().getDialogSettings(), configId); //$NON-NLS-1$
+ ds.put(configId + ".useMultipliers", labelProvider.areMultipliersUsed()); //$NON-NLS-1$
}
});
viewer.setComparator(new TableItemComparator(table.getColumnDataTypes()));
}
- // Passes the useMultipliers flag
- tlp.useMultipliers(useMultipliers);
-
- actionUseMultipliers.setChecked(useMultipliers);
- tlp.setColumns(table.getColumns());
+ labelProvider.setColumns(table.getColumns());
viewer.setInput(table);
currentData = table;
}
return instance.toString();
}
-
- /**
- * Sets the useMultipliers flag
- */
- private void useMultipliers()
- {
- if (!useMultipliers) {
- useMultipliers = true;
- } else if (useMultipliers) {
- useMultipliers = false;
- }
- updateViewer(currentData);
- }
-
/**
* Show line chart
*/
private TableColumnDefinition[] columns = null;
private TableRow row;
private Font keyColumnFont;
- private boolean useMultipliers;
+ private boolean useMultipliers = true;
/**
*
return null;
}
- public void useMultipliers(boolean useMultipliers)
+ /**
+ * @param useMultipliers
+ */
+ public void setUseMultipliers(boolean useMultipliers)
{
this.useMultipliers = useMultipliers;
}
+ /**
+ * @return
+ */
public boolean areMultipliersUsed()
{
return useMultipliers;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.PropertyPage;
import org.netxms.client.NXCObjectModificationData;
import org.netxms.client.NXCSession;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.ImageHyperlink;
import org.netxms.client.NXCSession;
-import org.netxms.client.TimePeriod;
import org.netxms.client.events.EventTemplate;
import org.netxms.ui.eclipse.console.resources.SharedIcons;
import org.netxms.ui.eclipse.eventmanager.widgets.EventSelector;
import org.eclipse.ui.IWorkbenchActionConstants;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.ViewPart;
import org.netxms.client.NXCSession;
import org.netxms.client.objects.AbstractObject;
*/
public class IntermediateSelectionProvider implements IPostSelectionProvider
{
- private final ListenerList selectionListeners = new ListenerList();
- private final ListenerList postSelectionListeners = new ListenerList();
- private ISelectionProvider delegate;
+ private final ListenerList<ISelectionChangedListener> selectionListeners = new ListenerList<ISelectionChangedListener>();
+ private final ListenerList<ISelectionChangedListener> postSelectionListeners = new ListenerList<ISelectionChangedListener>();
+ private ISelectionProvider delegate;
- private ISelectionChangedListener selectionListener = new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event)
- {
- if (event.getSelectionProvider() == delegate)
- {
- fireSelectionChanged(event.getSelection());
- }
- }
- };
+ private ISelectionChangedListener selectionListener = new ISelectionChangedListener() {
+ public void selectionChanged(SelectionChangedEvent event)
+ {
+ if (event.getSelectionProvider() == delegate)
+ {
+ fireSelectionChanged(event.getSelection());
+ }
+ }
+ };
- private ISelectionChangedListener postSelectionListener = new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event)
- {
- if (event.getSelectionProvider() == delegate)
- {
- firePostSelectionChanged(event.getSelection());
- }
- }
- };
+ private ISelectionChangedListener postSelectionListener = new ISelectionChangedListener() {
+ public void selectionChanged(SelectionChangedEvent event)
+ {
+ if (event.getSelectionProvider() == delegate)
+ {
+ firePostSelectionChanged(event.getSelection());
+ }
+ }
+ };
- /**
- * Sets a new selection provider to delegate to. Selection listeners registered with the previous delegate are removed before.
- *
- * @param newDelegate new selection provider
- */
- public void setSelectionProviderDelegate(ISelectionProvider newDelegate)
- {
- if (delegate == newDelegate)
- {
- return;
- }
- if (delegate != null)
- {
- delegate.removeSelectionChangedListener(selectionListener);
- if (delegate instanceof IPostSelectionProvider)
- {
- ((IPostSelectionProvider)delegate).removePostSelectionChangedListener(postSelectionListener);
- }
- }
- delegate = newDelegate;
- if (newDelegate != null)
- {
- newDelegate.addSelectionChangedListener(selectionListener);
- if (newDelegate instanceof IPostSelectionProvider)
- {
- ((IPostSelectionProvider)newDelegate).addPostSelectionChangedListener(postSelectionListener);
- }
- fireSelectionChanged(newDelegate.getSelection());
- firePostSelectionChanged(newDelegate.getSelection());
- }
- }
+ /**
+ * Sets a new selection provider to delegate to. Selection listeners registered with the previous delegate are removed before.
+ *
+ * @param newDelegate new selection provider
+ */
+ public void setSelectionProviderDelegate(ISelectionProvider newDelegate)
+ {
+ if (delegate == newDelegate)
+ {
+ return;
+ }
+ if (delegate != null)
+ {
+ delegate.removeSelectionChangedListener(selectionListener);
+ if (delegate instanceof IPostSelectionProvider)
+ {
+ ((IPostSelectionProvider)delegate).removePostSelectionChangedListener(postSelectionListener);
+ }
+ }
+ delegate = newDelegate;
+ if (newDelegate != null)
+ {
+ newDelegate.addSelectionChangedListener(selectionListener);
+ if (newDelegate instanceof IPostSelectionProvider)
+ {
+ ((IPostSelectionProvider)newDelegate).addPostSelectionChangedListener(postSelectionListener);
+ }
+ fireSelectionChanged(newDelegate.getSelection());
+ firePostSelectionChanged(newDelegate.getSelection());
+ }
+ }
- protected void fireSelectionChanged(ISelection selection)
- {
- fireSelectionChanged(selectionListeners, selection);
- }
+ protected void fireSelectionChanged(ISelection selection)
+ {
+ fireSelectionChanged(selectionListeners, selection);
+ }
- protected void firePostSelectionChanged(ISelection selection)
- {
- fireSelectionChanged(postSelectionListeners, selection);
- }
+ protected void firePostSelectionChanged(ISelection selection)
+ {
+ fireSelectionChanged(postSelectionListeners, selection);
+ }
- private void fireSelectionChanged(ListenerList list, ISelection selection)
- {
- SelectionChangedEvent event = new SelectionChangedEvent(delegate, selection);
- Object[] listeners = list.getListeners();
- for(int i = 0; i < listeners.length; i++)
- {
- ISelectionChangedListener listener = (ISelectionChangedListener)listeners[i];
- listener.selectionChanged(event);
- }
- }
+ private void fireSelectionChanged(ListenerList<ISelectionChangedListener> list, ISelection selection)
+ {
+ SelectionChangedEvent event = new SelectionChangedEvent(delegate, selection);
+ for(ISelectionChangedListener listener : list)
+ listener.selectionChanged(event);
+ }
- // IPostSelectionProvider Implementation
+ // IPostSelectionProvider Implementation
- public void addSelectionChangedListener(ISelectionChangedListener listener)
- {
- selectionListeners.add(listener);
- }
+ public void addSelectionChangedListener(ISelectionChangedListener listener)
+ {
+ selectionListeners.add(listener);
+ }
- public void removeSelectionChangedListener(ISelectionChangedListener listener)
- {
- selectionListeners.remove(listener);
- }
+ public void removeSelectionChangedListener(ISelectionChangedListener listener)
+ {
+ selectionListeners.remove(listener);
+ }
- public void addPostSelectionChangedListener(ISelectionChangedListener listener)
- {
- postSelectionListeners.add(listener);
- }
+ public void addPostSelectionChangedListener(ISelectionChangedListener listener)
+ {
+ postSelectionListeners.add(listener);
+ }
- public void removePostSelectionChangedListener(ISelectionChangedListener listener)
- {
- postSelectionListeners.remove(listener);
- }
+ public void removePostSelectionChangedListener(ISelectionChangedListener listener)
+ {
+ postSelectionListeners.remove(listener);
+ }
- public ISelection getSelection()
- {
- return delegate == null ? null : delegate.getSelection();
- }
+ public ISelection getSelection()
+ {
+ return delegate == null ? null : delegate.getSelection();
+ }
- public void setSelection(ISelection selection)
- {
- if (delegate != null)
- {
- delegate.setSelection(selection);
- }
- }
+ public void setSelection(ISelection selection)
+ {
+ if (delegate != null)
+ {
+ delegate.setSelection(selection);
+ }
+ }
}
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PlatformUI;
import org.netxms.client.NXCSession;
import org.netxms.client.SessionListener;
import org.netxms.client.SessionNotification;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.PlatformUI;
import org.netxms.client.NXCSession;
import org.netxms.client.datacollection.ConditionDciInfo;
import org.netxms.client.datacollection.DataCollectionObject;
private long dciId = 0;
private String configId;
private String objectName = null;
- private String id;
private Table currentData = null;
private SortableTableViewer viewer;
+ private TableLabelProvider labelProvider;
private CLabel errorLabel;
private CellSelectionManager cellSelectionManager;
private Action actionShowLineChart;
private Action actionShowBarChart;
private Action actionShowPieChart;
private Action actionUseMultipliers;
- private boolean useMultipliers = false;
- private TableLabelProvider tlp;
/**
* @param parent
* @param style
* @param viewPart
*/
- public TableValue(Composite parent, int style, IViewPart viewPart, String configId)
+ public TableValue(Composite parent, int style, IViewPart viewPart, String configSubId)
{
super(parent, style);
this.viewPart = viewPart;
- this.configId = configId;
session = (NXCSession)ConsoleSharedData.getSession();
setLayout(new FormLayout());
viewer = new SortableTableViewer(this, SWT.FULL_SELECTION | SWT.MULTI);
viewer.setContentProvider(new TableContentProvider());
- viewer.setLabelProvider(new TableLabelProvider());
+ labelProvider = new TableLabelProvider();
+ viewer.setLabelProvider(labelProvider);
cellSelectionManager = new CellSelectionManager(viewer);
- final IDialogSettings ds = Activator.getDefault().getDialogSettings();
- tlp = (TableLabelProvider)viewer.getLabelProvider();
-
FormData fd = new FormData();
fd.top = new FormAttachment(0, 0);
fd.left = new FormAttachment(0, 0);
fd.right = new FormAttachment(100, 0);
fd.bottom = new FormAttachment(100, 0);
viewer.getControl().setLayoutData(fd);
-
- createActions();
- createPopupMenu();
StringBuilder sb = new StringBuilder("TableLastValues."); //$NON-NLS-1$
sb.append(dciId);
- if (configId != null)
+ if (configSubId != null)
{
sb.append('.');
- sb.append(configId);
+ sb.append(configSubId);
}
- id = sb.toString();
+ configId = sb.toString();
- if (ds.get(id + ".useMultipliers") != null) {//$NON-NLS-1$
- useMultipliers = ds.getBoolean(id + ".useMultipliers");
- }
- else
- tlp.useMultipliers(useMultipliers);
+ final IDialogSettings ds = Activator.getDefault().getDialogSettings();
+ if (ds.get(configId + ".useMultipliers") != null)
+ labelProvider.setUseMultipliers(ds.getBoolean(configId + ".useMultipliers"));
+
+ createActions();
+ createPopupMenu();
}
/**
@Override
public void run()
{
- useMultipliers();
+ labelProvider.setUseMultipliers(actionUseMultipliers.isChecked());
+ viewer.refresh(true);
}
};
+ actionUseMultipliers.setChecked(labelProvider.areMultipliersUsed());
}
/**
Arrays.fill(widths, 150);
viewer.createColumns(names, widths, 0, SWT.UP);
-
-
- WidgetHelper.restoreTableViewerSettings(viewer, Activator.getDefault().getDialogSettings(), id); //$NON-NLS-1$
+ WidgetHelper.restoreTableViewerSettings(viewer, Activator.getDefault().getDialogSettings(), configId); //$NON-NLS-1$
viewer.getTable().addDisposeListener(new DisposeListener() {
@Override
public void widgetDisposed(DisposeEvent e)
{
- WidgetHelper.saveTableViewerSettings(viewer, Activator.getDefault().getDialogSettings(), id); //$NON-NLS-1$
- ds.put(id + ".useMultipliers", tlp.areMultipliersUsed()); //$NON-NLS-1$
+ WidgetHelper.saveTableViewerSettings(viewer, Activator.getDefault().getDialogSettings(), configId); //$NON-NLS-1$
+ ds.put(configId + ".useMultipliers", labelProvider.areMultipliersUsed()); //$NON-NLS-1$
}
});
viewer.setComparator(new TableItemComparator(table.getColumnDataTypes()));
}
- TableLabelProvider tlp = (TableLabelProvider)viewer.getLabelProvider();
-
- // Passes the useMultipliers flag
- tlp.useMultipliers(useMultipliers);
- actionUseMultipliers.setChecked(useMultipliers);
- tlp.setColumns(table.getColumns());
+ labelProvider.setColumns(table.getColumns());
viewer.setInput(table);
currentData = table;
}
return instance.toString();
}
-
- /**
- * Sets the useMultipliers flag
- */
- private void useMultipliers()
- {
- if (!useMultipliers) {
- actionUseMultipliers.setChecked(true);
- useMultipliers = true;
- } else if (useMultipliers) {
- actionUseMultipliers.setChecked(false);
- useMultipliers = false;
- }
- updateViewer(currentData);
- }
-
/**
* Show line chart
*/
private TableColumnDefinition[] columns = null;
private TableRow row;
private Font keyColumnFont;
- private boolean useMultipliers;
+ private boolean useMultipliers = true;
/**
*
return null;
}
- public void useMultipliers(boolean useMultipliers)
+ /**
+ * @param useMultipliers
+ */
+ public void setUseMultipliers(boolean useMultipliers)
{
this.useMultipliers = useMultipliers;
}
+ /**
+ * @return
+ */
public boolean areMultipliersUsed()
- {
- return useMultipliers;
- }
+ {
+ return useMultipliers;
+ }
/**
* @param columnIndex
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.PropertyPage;
import org.netxms.client.NXCObjectModificationData;
import org.netxms.client.NXCSession;
import org.eclipse.ui.IWorkbenchActionConstants;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.ViewPart;
import org.netxms.client.NXCSession;
import org.netxms.client.objects.AbstractObject;
git.netxms.org / public / netxms.git / commitdiff
