Skip to content

Commit

Permalink
Use a dialog to select User Properties for the Search Filter
Browse files Browse the repository at this point in the history 
- And refactor into UserPropertiesKeySelectionDialog that can be re-used
  • Loading branch information
@Phillipus
Phillipus committed Dec 14, 2024
1 parent 2473902 commit e73bc4f
Show file tree
Hide file tree
Showing 13 changed files with 263 additions and 209 deletions.
6 changes: 0 additions & 6 deletions com.archimatetool.editor/src/com/archimatetool/editor/propertysections/Messages.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,16 +345,10 @@ public class Messages extends NLS {

public static String UserPropertiesSection_14;

public static String UserPropertiesSection_15;

public static String UserPropertiesSection_16;

public static String UserPropertiesSection_17;

public static String UserPropertiesSection_18;

public static String UserPropertiesSection_19;

public static String UserPropertiesSection_2;

public static String UserPropertiesSection_20;
Expand Down
143 changes: 9 additions & 134 deletions ...imatetool.editor/src/com/archimatetool/editor/propertysections/UserPropertiesSection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.CellLabelProvider;
import org.eclipse.jface.viewers.CheckboxTableViewer;
import org.eclipse.jface.viewers.ColumnViewer;
import org.eclipse.jface.viewers.ColumnViewerEditor;
import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
Expand All @@ -52,7 +51,6 @@
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TableViewerColumn;
import org.eclipse.jface.viewers.TableViewerEditor;
Expand All @@ -68,14 +66,10 @@
import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.events.MouseListener;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Event;
Expand All @@ -93,9 +87,9 @@
import com.archimatetool.editor.preferences.IPreferenceConstants;
import com.archimatetool.editor.ui.IArchiImages;
import com.archimatetool.editor.ui.ThemeUtils;
import com.archimatetool.editor.ui.components.ExtendedTitleAreaDialog;
import com.archimatetool.editor.ui.components.GlobalActionDisablementHandler;
import com.archimatetool.editor.ui.components.StringComboBoxCellEditor;
import com.archimatetool.editor.ui.dialog.UserPropertiesKeySelectionDialog;
import com.archimatetool.editor.utils.HTMLUtils;
import com.archimatetool.editor.utils.StringUtils;
import com.archimatetool.model.IArchimateFactory;
Expand Down Expand Up @@ -1097,7 +1091,7 @@ private NewMultiplePropertiesAction() {
@Override
public void run() {
if(isAlive(getFirstSelectedElement())) {
MultipleAddDialog dialog = new MultipleAddDialog(fPage.getSite().getShell(), getAllUniquePropertyKeysForModel(MAX_ITEMS_ALL));
MultipleAddDialog dialog = new MultipleAddDialog(fPage.getSite().getShell(), List.of(getAllUniquePropertyKeysForModel(MAX_ITEMS_ALL)));
if(dialog.open() != Window.CANCEL) {
List<String> newKeys = dialog.getSelectedKeys();
if(newKeys == null || newKeys.isEmpty()) {
Expand Down Expand Up @@ -1367,147 +1361,28 @@ public void dispose() {
//
// -----------------------------------------------------------------------------------------------------------------

private static class MultipleAddDialog extends ExtendedTitleAreaDialog {
private CheckboxTableViewer tableViewer;
private Button buttonSelectAll, buttonDeselectAll;

private String[] keys;
private List<String> selectedKeys;

public MultipleAddDialog(Shell parentShell, String[] keys) {
super(parentShell, "ArchimatePropertiesMultipleAddDialog"); //$NON-NLS-1$
setTitleImage(IArchiImages.ImageFactory.getImage(IArchiImages.ECLIPSE_IMAGE_IMPORT_PREF_WIZARD));
setShellStyle(getShellStyle() | SWT.RESIZE);
this.keys = keys;
}

@Override
protected void configureShell(Shell shell) {
super.configureShell(shell);
shell.setText(Messages.UserPropertiesSection_15);
}

@Override
protected Control createButtonBar(Composite parent) {
Control c = super.createButtonBar(parent);
if(keys.length == 0) {
getButton(IDialogConstants.OK_ID).setEnabled(false);
buttonSelectAll.setEnabled(false);
buttonDeselectAll.setEnabled(false);
}
return c;
private static class MultipleAddDialog extends UserPropertiesKeySelectionDialog {
public MultipleAddDialog(Shell parentShell, List<String> keys) {
super(parentShell, keys, null);
}

@Override
protected Control createDialogArea(Composite parent) {
// Help
PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, HELP_ID);

Composite composite = (Composite)super.createDialogArea(parent);
setTitle(Messages.UserPropertiesSection_16);
setMessage(Messages.UserPropertiesSection_17);

Composite composite = (Composite)super.createDialogArea(parent);

Composite client = new Composite(composite, SWT.NULL);
GridLayout layout = new GridLayout(2, false);
client.setLayout(layout);
client.setLayoutData(new GridData(GridData.FILL_BOTH));

createTableControl(client);
createButtonPanel(client);

return composite;
}

private void createTableControl(Composite parent) {
Composite tableComp = new Composite(parent, SWT.BORDER);
TableColumnLayout tableLayout = new TableColumnLayout();
tableComp.setLayout(tableLayout);
tableComp.setLayoutData(new GridData(GridData.FILL_BOTH));

tableViewer = CheckboxTableViewer.newCheckList(tableComp, SWT.MULTI | SWT.FULL_SELECTION);
tableViewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));

tableViewer.getTable().setLinesVisible(true);

// Column
TableViewerColumn columnKey = new TableViewerColumn(tableViewer, SWT.NONE, 0);
tableLayout.setColumnData(columnKey.getColumn(), new ColumnWeightData(100, true));

// Content Provider
tableViewer.setContentProvider(new IStructuredContentProvider() {
@Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
}

@Override
public Object[] getElements(Object inputElement) {
return keys;
}

@Override
public void dispose() {
}
});

// Label Provider
tableViewer.setLabelProvider(new LabelProvider());
tableViewer.setInput(keys);
}

private void createButtonPanel(Composite parent) {
Composite client = new Composite(parent, SWT.NULL);

GridLayout layout = new GridLayout();
layout.marginHeight = 0;
layout.marginWidth = 0;
client.setLayout(layout);

GridData gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
client.setLayoutData(gd);

buttonSelectAll = new Button(client, SWT.PUSH);
buttonSelectAll.setText(Messages.UserPropertiesSection_18);
gd = new GridData(GridData.FILL_HORIZONTAL);
buttonSelectAll.setLayoutData(gd);
buttonSelectAll.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> {
tableViewer.setCheckedElements(keys);
}));

buttonDeselectAll = new Button(client, SWT.PUSH);
buttonDeselectAll.setText(Messages.UserPropertiesSection_19);
gd = new GridData(GridData.FILL_HORIZONTAL);
buttonDeselectAll.setLayoutData(gd);
buttonDeselectAll.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> {
tableViewer.setCheckedElements(new Object[] {});
}));
}

@Override
protected void createButtonsForButtonBar(Composite parent) {
createButton(parent, IDialogConstants.OK_ID, Messages.UserPropertiesSection_6, true);
createButton(parent, IDialogConstants.CLIENT_ID, Messages.UserPropertiesSection_23, false);
createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
}

@Override
protected void buttonPressed(int buttonId) {
selectedKeys = new ArrayList<>();
for(Object o : tableViewer.getCheckedElements()) {
selectedKeys.add((String)o);

if(keys.size() == 0) {
getButton(IDialogConstants.CLIENT_ID).setEnabled(false);
}

setReturnCode(buttonId);
close();
}

List<String> getSelectedKeys() {
return selectedKeys;
}

@Override
protected Point getDefaultDialogSize() {
return new Point(400, 250);
}
}

Expand Down
3 changes: 0 additions & 3 deletions com.archimatetool.editor/src/com/archimatetool/editor/propertysections/messages.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,11 +189,8 @@ UserPropertiesSection_11=Set Property Value
UserPropertiesSection_12=New Property
UserPropertiesSection_13=Move Property
UserPropertiesSection_14=Sort Properties
UserPropertiesSection_15=Properties
UserPropertiesSection_16=Add Multiple Properties
UserPropertiesSection_17=Select the Properties to add to this Element
UserPropertiesSection_18=Select All
UserPropertiesSection_19=Deselect All
UserPropertiesSection_2=New
UserPropertiesSection_20=Add Properties
UserPropertiesSection_21=Double-click on icon to open link in Browser
Expand Down
10 changes: 10 additions & 0 deletions com.archimatetool.editor/src/com/archimatetool/editor/ui/dialog/Messages.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,16 @@ public class Messages extends NLS {
public static String RelationshipsMatrixDialog_1;

public static String RelationshipsMatrixDialog_2;

public static String UserPropertiesKeySelectionDialog_0;

public static String UserPropertiesKeySelectionDialog_1;

public static String UserPropertiesKeySelectionDialog_2;

public static String UserPropertiesKeySelectionDialog_3;

public static String UserPropertiesKeySelectionDialog_4;
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
Expand Down
Loading

0 comments on commit e73bc4f

Please sign in to comment.