ff-attic/imxmi
2
0
Fork 0
Code Activity

added jface dep and made swt test run again

Browse source
This commit is contained in:
willemc 2010-05-01 00:47:48 +02:00
parent 58347ef9fb
commit dba13c08b7
6 changed files with 47 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/com/idcanet/vasc/frontends/swt/SwtVascEditDialog.java
View file

@ -69,6 +69,9 @@ public class SwtVascEditDialog extends Dialog {
}
protected Object i18nImage(String key) {
if (entry.getVascFrontendData().getVascEntryResourceImageResolver()==null) {
return null;
}
return entry.getVascFrontendData().getVascEntryResourceImageResolver().getImageValue(entry,key);
}
@ -123,7 +126,7 @@ public class SwtVascEditDialog extends Dialog {
}
String name = null;
try {
Object bean = entry.getVascFrontendData().getEntryDataObject();
Object bean = entry.getVascFrontendData().getVascEntryState().getEntryDataObject();
name = dis.getVascEntryFieldValue().getDisplayValue(dis, bean);
} catch (VascException e) {
throw new RuntimeException("Could not display value from "+entry.getId(),e);
@ -133,7 +136,7 @@ public class SwtVascEditDialog extends Dialog {
header.setBackground(c);
Label img = new Label(header, SWT.NONE);
if (entry.getVascFrontendData().isEditCreate()) {
if (entry.getVascFrontendData().getVascEntryState().isEditCreate()) {
img.setImage((Image)i18nImage(entry.getCreateImage()));
} else {
img.setImage((Image)i18nImage(entry.getEditImage()));
@ -142,7 +145,7 @@ public class SwtVascEditDialog extends Dialog {
Font headerFont = new Font(header.getDisplay(), "verdana", 14, SWT.NONE);
Label l = new Label(header, SWT.CENTER);
if (entry.getVascFrontendData().isEditCreate()) {
if (entry.getVascFrontendData().getVascEntryState().isEditCreate()) {
l.setText(i18n(entry.getCreateDescription(),name));
} else {
l.setText(i18n(entry.getEditDescription(),name));
@ -154,7 +157,7 @@ public class SwtVascEditDialog extends Dialog {
public void createBody(Composite body) throws VascException {
body.setLayout(new GridLayout(2, true));
body.setLayoutData(new GridData(GridData.FILL_BOTH));
Object bean = entry.getVascFrontendData().getEntryDataObject();
Object bean = entry.getVascFrontendData().getVascEntryState().getEntryDataObject();
entry.getVascFrontendData().clearFieldRenderObjects(); // only needed for swt use
@ -219,7 +222,7 @@ public class SwtVascEditDialog extends Dialog {
cancelButton.setToolTipText(i18n("vasc.action.cancelAction.description"));
cancelButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
entry.getVascFrontendData().setEntryDataObject(null);
entry.getVascFrontendData().getVascEntryState().setEntryDataObject(null);
shell.dispose();
}
});

14
src/main/java/com/idcanet/vasc/frontends/swt/SwtVascFrontend.java
View file

@ -138,7 +138,13 @@ public class SwtVascFrontend extends AbstractVascFrontend {
}
@Override
protected Object i18nImage(String key) {
if (entry.getVascFrontendData().getVascEntryResourceImageResolver()==null) {
return null;
}
return entry.getVascFrontendData().getVascEntryResourceImageResolver().getImageValue(entry,key);
}
private static final String[] FILTER_NAMES = {
"All Files (*.*)",
@ -405,7 +411,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
public void widgetSelected(SelectionEvent e) {
Object data = e.item.getData();
logger.fine("Slecting data: "+data);
entry.getVascFrontendData().setEntryDataObject(data);
entry.getVascFrontendData().getVascEntryState().setEntryDataObject(data);
}
});
@ -544,7 +550,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
public void widgetSelected(SelectionEvent event) {
logger.fine("Row Action");
try {
action.doRowAction(entry, entry.getVascFrontendData().getEntryDataObject());
action.doRowAction(entry, entry.getVascFrontendData().getVascEntryState().getEntryDataObject());
} catch (Exception e) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry,e);
}
@ -634,7 +640,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
* @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
*/
public Object[] getElements(Object obj) {
return ((VascEntry)obj).getVascFrontendData().getEntryDataList().toArray();
return ((VascEntry)obj).getVascFrontendData().getVascEntryState().getEntryDataList().toArray();
}
/**