ff-attic/imxmi
2
0
Fork 0
Code Activity

Refactored internal api

Browse source
This commit is contained in:
Willem Cazander 2012-06-04 22:49:12 +02:00
parent 3f31bb8a3a
commit 6ccd763d1f
361 changed files with 23049 additions and 4498 deletions
Download patch file Download diff file Expand all files Collapse all files

6
vasc-frontend/vasc-frontend-swt/pom.xml
View file

@ -27,7 +27,7 @@
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>jface</artifactId>
<version>3.3.0-I20070606-0010</version>
<version>${jface.version}</version>
<scope>compile</scope>
<optional />
</dependency>
@ -36,7 +36,7 @@
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>jface</artifactId>
<version>3.2.1-M20060908-1000</version>
<version>${jface.version}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@ -65,7 +65,7 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.forwardfire.vasc</groupId>
<groupId>net.forwardfire.vasc.test</groupId>
<artifactId>vasc-test-frontend-data</artifactId>
<version>${project.version}</version>
<scope>test</scope>

20
vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtActionPanel.java
View file

@ -61,7 +61,7 @@ public class SwtActionPanel implements VascEntryFrontendEventListener {
public SwtActionPanel(VascEntry entry) {
this.entry=entry;
entry.getVascFrontendData().addVascEntryFrontendEventListener(this);
entry.getVascFrontendController().addVascEntryFrontendEventListener(this);
}
public void createComposite(Composite parent) {
@ -75,15 +75,15 @@ public class SwtActionPanel implements VascEntryFrontendEventListener {
Label l = new Label(actionRow, SWT.CENTER);
l.setText("Row Numbers");
rowNumberField = new Text(actionRow, SWT.NONE | SWT.BORDER);
rowNumberField.setText(""+entry.getVascFrontendData().getVascEntryState().getVascBackendState().getPageSize()+" ");
rowNumberField.setText(""+entry.getVascFrontendController().getVascEntryState().getVascBackendState().getPageSize()+" ");
rowNumberField.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent arg0) {
if (vascEvent) {
return;
}
int pageSize = new Integer(rowNumberField.getText());
entry.getVascFrontendData().getVascEntryState().getVascBackendState().setPageSize(pageSize);
entry.getVascFrontendData().getVascFrontendActions().refreshData();
entry.getVascFrontendController().getVascEntryState().getVascBackendState().setPageSize(pageSize);
entry.getVascFrontendController().getVascFrontendActions().refreshData();
}
});
@ -93,7 +93,7 @@ public class SwtActionPanel implements VascEntryFrontendEventListener {
pageBox = new Combo(actionRow,SWT.SINGLE | SWT.BORDER);
pageBox.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
entry.getVascFrontendData().getVascFrontendActions().pageAction(pageBox.getSelectionIndex()-1);
entry.getVascFrontendController().getVascFrontendActions().pageAction(pageBox.getSelectionIndex()-1);
pageBox.select(0);
}
});
@ -128,10 +128,10 @@ public class SwtActionPanel implements VascEntryFrontendEventListener {
public void vascEvent(VascEntry entry,Object dataNotUsed) {
vascEvent = true;
long pageSize = entry.getVascFrontendData().getVascFrontendPager().getPageSize();
long pageStart = entry.getVascFrontendData().getVascFrontendPager().getPageStartCount();
long pageStop = entry.getVascFrontendData().getVascFrontendPager().getPageStopCount();
long pageTotalCount = entry.getVascFrontendData().getVascFrontendPager().getPageTotalRecordCount();
long pageSize = entry.getVascFrontendController().getVascFrontendPager().getPageSize();
long pageStart = entry.getVascFrontendController().getVascFrontendPager().getPageStartCount();
long pageStop = entry.getVascFrontendController().getVascFrontendPager().getPageStopCount();
long pageTotalCount = entry.getVascFrontendController().getVascFrontendPager().getPageTotalRecordCount();
String format = "Results %1$d-%2$d from %3$d rows";
resultLabel.setText(String.format(format, pageStart, pageStop, pageTotalCount));
resultLabel.redraw();
@ -140,7 +140,7 @@ public class SwtActionPanel implements VascEntryFrontendEventListener {
pageBox.removeAll();
pageBox.add("Goto...");
List<VascBackendPageNumber> pages = entry.getVascFrontendData().getVascFrontendPager().getTablePagesFromBackend();
List<VascBackendPageNumber> pages = entry.getVascFrontendController().getVascFrontendPager().getTablePagesFromBackend();
int i=0;
for (VascBackendPageNumber page:pages) {
pageBox.add("page: "+page.getPageNumber()+" "+(i*pageSize)+"-"+((i*pageSize)+pageSize));

2
vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtPagerPanel.java
View file

@ -52,7 +52,7 @@ public class SwtPagerPanel implements VascEntryFrontendEventListener {
public SwtPagerPanel(VascEntry entry) {
this.entry=entry;
entry.getVascFrontendData().addVascEntryFrontendEventListener(this);
entry.getVascFrontendController().addVascEntryFrontendEventListener(this);
}
public void createComposite(Composite parent) {

28
vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtVascEditDialog.java
View file

@ -63,14 +63,14 @@ public class SwtVascEditDialog extends Dialog {
}
protected String i18n(String key,Object...params) {
return entry.getVascFrontendData().getVascEntryResourceResolver().getTextValue(key,params);
return entry.getVascFrontendController().getVascEntryResourceResolver().getTextValue(key,params);
}
protected Object i18nImage(String key) {
if (entry.getVascFrontendData().getVascEntryResourceImageResolver()==null) {
if (entry.getVascFrontendController().getVascEntryResourceImageResolver()==null) {
return null;
}
return entry.getVascFrontendData().getVascEntryResourceImageResolver().getImageValue(entry,key);
return entry.getVascFrontendController().getVascEntryResourceImageResolver().getImageValue(entry,key);
}
public void open() throws VascException {
@ -124,7 +124,7 @@ public class SwtVascEditDialog extends Dialog {
}
String name = null;
try {
Object bean = entry.getVascFrontendData().getVascEntryState().getEntryDataObject();
Object bean = entry.getVascFrontendController().getVascEntryState().getEntryDataObject();
name = dis.getVascEntryFieldValue().getDisplayValue(dis, bean);
} catch (VascException e) {
throw new RuntimeException("Could not display value from "+entry.getId(),e);
@ -134,7 +134,7 @@ public class SwtVascEditDialog extends Dialog {
header.setBackground(c);
Label img = new Label(header, SWT.NONE);
if (entry.getVascFrontendData().getVascEntryState().isEditCreate()) {
if (entry.getVascFrontendController().getVascEntryState().isEditCreate()) {
img.setImage((Image)i18nImage(entry.getCreateImage()));
} else {
img.setImage((Image)i18nImage(entry.getEditImage()));
@ -143,7 +143,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().getVascEntryState().isEditCreate()) {
if (entry.getVascFrontendController().getVascEntryState().isEditCreate()) {
l.setText(i18n(entry.getCreateDescription(),name));
} else {
l.setText(i18n(entry.getEditDescription(),name));
@ -155,12 +155,12 @@ 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().getVascEntryState().getEntryDataObject();
Object bean = entry.getVascFrontendController().getVascEntryState().getEntryDataObject();
entry.getVascFrontendData().clearFieldRenderObjects(); // only needed for swt use
entry.getVascFrontendController().clearFieldRenderObjects(); // only needed for swt use
for (VascEntryField c:entry.getVascEntryFields()) {
if (entry.getVascFrontendData().getVascFrontendHelper().renderEdit(c)==false) {
if (entry.getVascFrontendController().getVascFrontendDataSelector().isFieldEdit(c)==false) {
continue;
}
@ -188,11 +188,11 @@ public class SwtVascEditDialog extends Dialog {
}
if (i==0) {
entry.getVascFrontendData().addFieldVascUIComponents(c, editor,edit);
entry.getVascFrontendController().addFieldVascUIComponents(c, editor,edit);
}
}
}
entry.getVascFrontendData().getVascFrontendHelper().editReadOnlyUIComponents(entry);
entry.getVascFrontendController().getVascFrontendHelper().editReadOnlyUIComponents(entry);
}
public void createFooter(Composite body) {
@ -203,11 +203,11 @@ public class SwtVascEditDialog extends Dialog {
saveButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
try {
boolean error = entry.getVascFrontendData().getVascFrontendHelper().validateAndSetErrorText(entry);
boolean error = entry.getVascFrontendController().getVascFrontendHelper().validateAndSetErrorText(entry);
if (error) {
return;
}
entry.getVascFrontendData().getVascFrontendActions().mergeObject();
entry.getVascFrontendController().getVascFrontendActions().mergeObject();
shell.dispose();
} catch (Exception ee) {
ee.printStackTrace();
@ -220,7 +220,7 @@ public class SwtVascEditDialog extends Dialog {
cancelButton.setToolTipText(i18n("vasc.action.cancelAction.description"));
cancelButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
entry.getVascFrontendData().getVascEntryState().setEntryDataObject(null);
entry.getVascFrontendController().getVascEntryState().setEntryDataObject(null);
shell.dispose();
}
});

49
vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtVascFrontend.java
View file

@ -29,6 +29,7 @@ import java.util.logging.Logger;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.VascEntryField;
import net.forwardfire.vasc.core.VascEntryListOption;
import net.forwardfire.vasc.core.VascException;
import net.forwardfire.vasc.core.actions.GlobalVascAction;
import net.forwardfire.vasc.core.actions.RowVascAction;
@ -39,7 +40,7 @@ import net.forwardfire.vasc.core.ui.VascUIComponent;
import net.forwardfire.vasc.core.ui.VascValueModel;
import net.forwardfire.vasc.core.ui.VascValueModelListener;
import net.forwardfire.vasc.frontend.AbstractVascFrontend;
import net.forwardfire.vasc.frontend.VascFrontendData;
import net.forwardfire.vasc.frontend.VascFrontendController;
import net.forwardfire.vasc.frontend.swt.ui.SwtBoolean;
import net.forwardfire.vasc.frontend.swt.ui.SwtButton;
import net.forwardfire.vasc.frontend.swt.ui.SwtLabel;
@ -113,7 +114,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
* Add swt implmented ui components
*/
protected void addUiComponents() {
VascFrontendData vfd = getVascEntry().getVascFrontendData();
VascFrontendController vfd = getVascEntry().getVascFrontendController();
// required UI components
vfd.putVascUIComponent(VascUIComponent.VASC_LABEL,SwtLabel.class.getName());
@ -145,10 +146,10 @@ public class SwtVascFrontend extends AbstractVascFrontend {
@Override
public Object i18nImage(String key) {
if (entry.getVascFrontendData().getVascEntryResourceImageResolver()==null) {
if (entry.getVascFrontendController().getVascEntryResourceImageResolver()==null) {
return null;
}
return entry.getVascFrontendData().getVascEntryResourceImageResolver().getImageValue(entry,key);
return entry.getVascFrontendController().getVascEntryResourceImageResolver().getImageValue(entry,key);
}
private static final String[] FILTER_NAMES = {
@ -194,7 +195,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
return;
}
// yes
entry.getVascFrontendData().getVascFrontendActions().deleteObject();
entry.getVascFrontendController().getVascFrontendActions().deleteObject();
}
private boolean askDelete(Shell shell) {
@ -266,7 +267,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
ToolBar toolBar = new ToolBar(headerBar, SWT.NONE);
for (GlobalVascAction action:entry.getGlobalActions()) {
if (entry.getVascFrontendData().getVascFrontendHelper().renderGlobalVascAction(action)==false) {
if (entry.getVascFrontendController().getVascFrontendDataSelector().isActionAllowed(action)==false) {
continue;
}
ToolItem item = new ToolItem(toolBar, SWT.PUSH);
@ -318,7 +319,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
headerOptions.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
try {
for (VascEntryField option:entry.getListOptions()) {
for (VascEntryListOption option:entry.getVascEntryListOptions()) {
for (int i=0;i<option.getVascEntryFieldType().getUIComponentCount(option);i++) {
net.forwardfire.vasc.core.ui.VascUIComponent label = option.getVascEntryFieldType().provideLabelUIComponent(i,option);
@ -332,14 +333,14 @@ public class SwtVascFrontend extends AbstractVascFrontend {
model.setValue(option.getDefaultValue());
model.addListener(new VascValueModelListener() {
public void valueUpdate(VascValueModel model) throws VascException {
entry.getVascFrontendData().getVascFrontendActions().refreshData();// mm
entry.getVascFrontendController().getVascFrontendActions().refreshData();// mm
}
});
Object edit = editor.createComponent(entry,option,model,headerOptions);
// i==0 is for multi field editor support... which is stell very in progress
if (i==0) {
entry.getVascFrontendData().addFieldVascUIComponents(option, editor,edit);
entry.getVascFrontendController().addFieldVascUIComponents(option, editor,edit);
}
}
}
@ -358,9 +359,9 @@ public class SwtVascFrontend extends AbstractVascFrontend {
public void modifyText(ModifyEvent e) {
String value = text.getText();
try {
entry.getVascFrontendData().getVascFrontendActions().searchAction(value);
entry.getVascFrontendController().getVascFrontendActions().searchAction(value);
} catch (Exception ee) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry,ee);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry,ee);
}
}
});
@ -371,7 +372,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
SwtActionPanel actionBar = new SwtActionPanel(entry);
actionBar.createComposite(header);
entry.getVascFrontendData().getVascFrontendHelper().headerOptionsCreatedFillData(entry);
entry.getVascFrontendController().getVascFrontendHelper().headerOptionsCreatedFillData(entry);
} catch (Exception e) {
e.printStackTrace();
@ -394,7 +395,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
try {
action.doGlobalAction(entry);
} catch (Exception e) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry,e);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry,e);
}
}
}
@ -428,7 +429,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
public void widgetSelected(SelectionEvent e) {
Object data = e.item.getData();
logger.fine("Slecting data: "+data);
entry.getVascFrontendData().getVascEntryState().setEntryDataObject(data);
entry.getVascFrontendController().getVascEntryState().setEntryDataObject(data);
}
});
@ -453,11 +454,11 @@ public class SwtVascFrontend extends AbstractVascFrontend {
}
table2.setSortDirection(dir);
VascEntryField field = (VascEntryField)currentColumn.getData();
entry.getVascFrontendData().getVascFrontendActions().sortAction(field);
entry.getVascFrontendController().getVascFrontendActions().sortAction(field);
}
};
entry.getVascFrontendData().addVascEntryFrontendEventListener(new VascEntryFrontendEventListener() {
entry.getVascFrontendController().addVascEntryFrontendEventListener(new VascEntryFrontendEventListener() {
public VascFrontendEventType[] getEventTypes() {
VascFrontendEventType[] result = {VascEntryFrontendEventListener.VascFrontendEventType.POST_READ};
return result;
@ -470,7 +471,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
for (VascEntryField c:entry.getVascEntryFields()) {
if (entry.getVascFrontendData().getVascFrontendHelper().renderList(c)==false) {
if (entry.getVascFrontendController().getVascFrontendDataSelector().isFieldList(c)==false) {
continue;
}
TableColumn tc = new TableColumn(table2, SWT.LEFT);
@ -483,7 +484,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
tc.setResizable(true);
}
int totalWidth = entry.getVascFrontendData().getVascFrontendHelper().getTotalColumnsWidth(entry);
int totalWidth = entry.getVascFrontendController().getVascFrontendHelper().getTotalColumnsWidth(entry);
logger.finer("Total size: "+totalWidth);
TableColumn[] columns = table2.getColumns();
for (int i = 0; i < columns.length; i++) {
@ -550,7 +551,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
pagerBar.createComposite(footer);
for( RowVascAction action:entry.getRowActions()) {
if (entry.getVascFrontendData().getVascFrontendHelper().renderRowVascAction(action)==false) {
if (entry.getVascFrontendController().getVascFrontendDataSelector().isActionAllowed(action)==false) {
continue;
}
Button actionButton = new Button(footer, SWT.NONE);
@ -575,9 +576,9 @@ public class SwtVascFrontend extends AbstractVascFrontend {
public void widgetSelected(SelectionEvent event) {
logger.fine("Row Action");
try {
action.doRowAction(entry, entry.getVascFrontendData().getVascEntryState().getEntryDataObject());
action.doRowAction(entry, entry.getVascFrontendController().getVascEntryState().getEntryDataObject());
} catch (Exception e) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry,e);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry,e);
}
}
}
@ -606,7 +607,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
int col=0;
VascEntryField vtc = null;
for (VascEntryField c:entry.getVascEntryFields()) {
if (entry.getVascFrontendData().getVascFrontendHelper().renderList(c)==false) {
if (entry.getVascFrontendController().getVascFrontendDataSelector().isFieldList(c)==false) {
continue;
}
if (col==columnNumber) {
@ -617,7 +618,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
}
if (vtc==null) {
// should not happen
vtc = entry.getVascEntryFields().get(columnNumber);
//vtc = entry.getVascEntryFields().get(columnNumber);
}
//if (vtc.getVascColumnRenderer()==null) {
@ -665,7 +666,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().getVascEntryState().getEntryDataList().toArray();
return ((VascEntry)obj).getVascFrontendController().getVascEntryState().getEntryDataList().toArray();
}
/**

2
vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtBoolean.java
View file

@ -67,7 +67,7 @@ public class SwtBoolean implements VascUIComponent {
System.out.println("setting value: "+value);
model.setValue(value);
} catch (Exception ee) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry,ee);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry,ee);
}
}
});

2
vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtList.java
View file

@ -72,7 +72,7 @@ public class SwtList implements VascUIComponent {
try {
model.setValue(item.getValue());
} catch (Exception ee) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry,ee);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry,ee);
}
}
}

2
vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtText.java
View file

@ -75,7 +75,7 @@ public class SwtText implements VascUIComponent {
try {
model.setValue(value);
} catch (Exception ee) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry,ee);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry,ee);
}
}
}

2
vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtTextArea.java
View file

@ -99,7 +99,7 @@ public class SwtTextArea implements VascUIComponent {
try {
model.setValue(value);
} catch (Exception ee) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry,ee);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry,ee);
}
}
}

8
vasc-frontend/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/SWTTest.java
View file

@ -26,6 +26,7 @@ package net.forwardfire.vasc;
import net.forwardfire.vasc.core.VascController;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.VascEntryControllerLocal;
import net.forwardfire.vasc.core.VascEntryLocal;
import net.forwardfire.vasc.frontend.swt.SwtVascFrontend;
import net.forwardfire.vasc.impl.DefaultVascFactory;
import net.forwardfire.vasc.test.frontend.data.TestModelData;
@ -74,9 +75,10 @@ public class SWTTest extends TestCase {
VascController vc = testData.getTestVascController();
testData.createVascEntries(vc,(VascEntryControllerLocal)vc.getVascEntryController());
VascEntry ve = testData.getTestEntry(vc);
DefaultVascFactory.fillVascEntryFrontend(ve, vc, DefaultVascFactory.getDefaultVascFrontendData(null));
ve.getVascFrontendData().getVascFrontendActions().refreshData();
VascEntryLocal ve = testData.getTestEntry(vc);
vc.getVascEntryConfigController().configVascFrontendController(vc, ve);
ve.getVascFrontendController().getVascFrontendActions().refreshData();
render.initEntry(ve);
render.renderView();