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

2
vasc-frontend/vasc-frontend-cxf/vasc-frontend-cxf-client/pom.xml
View file

@ -13,7 +13,7 @@
<dependency>
<groupId>javax.jws</groupId>
<artifactId>jsr181-api</artifactId>
<version>1.0-MR1</version>
<version>${jsr181-api.version}</version>
</dependency>
</dependencies>
</project>

10
vasc-frontend/vasc-frontend-cxf/vasc-frontend-cxf-server/pom.xml
View file

@ -23,27 +23,27 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>2.6.0</version>
<version>${cxf-rt.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-databinding-jaxb</artifactId>
<version>2.6.0</version>
<version>${cxf-rt.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>2.6.0</version>
<version>${cxf-rt.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>2.6.0</version>
<version>${cxf-rt.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<version>${servlet-api.version}</version>
<type>jar</type>
<scope>provided</scope>
</dependency>

12
vasc-frontend/vasc-frontend-cxf/vasc-frontend-cxf-server/src/main/java/net/forwardfire/vasc/frontend/cxf/server/web/VascCXFServlet.java
View file

@ -63,13 +63,23 @@ public class VascCXFServlet extends CXFNonSpringServlet {
if (exportTreeStr!=null && "true".equalsIgnoreCase(exportTreeStr)) {
exportTree = true;
}
String classArgument = null;
int atIndex = className.indexOf('@');
if (atIndex > 0) {
classArgument = className.substring(0,atIndex);
className = className.substring(atIndex+1);
}
try {
ClassLoader cl = Thread.currentThread().getContextClassLoader();
if (cl == null) {
cl = className.getClass().getClassLoader();
}
Class<?> clazz = cl.loadClass(className);
vascControllerProvider = (VascControllerProvider)clazz.newInstance();
if (classArgument==null) {
vascControllerProvider = (VascControllerProvider)clazz.newInstance();
} else {
vascControllerProvider = (VascControllerProvider)clazz.getConstructor(String.class).newInstance(classArgument);
}
} catch (Exception e) {
throw new ServletException("Could not create VascControllerProvider: "+e.getMessage(),e);
}

11
vasc-frontend/vasc-frontend-swing/pom.xml
View file

@ -16,17 +16,16 @@
</dependency>
<!-- FFF depency
<dependency>
<groupId>net.forwardfire.fff</groupId>
<artifactId>fff-main</artifactId>
<version>0.8-SNAPSHOT</version>
<scope>compile</scope>
<groupId>net.forwardfire.vasc.lib.fff</groupId>
<artifactId>fff-icons</artifactId>
<version>${project.version}</version>
</dependency>
-->
<!-- Swing date editor depency -->
<dependency>
<groupId>com.michaelbaranov</groupId>
<artifactId>microba</artifactId>
<version>0.4.4.1</version>
<version>${microba.version}</version>
</dependency>
<dependency>
<groupId>de.odysseus.juel</groupId>
@ -35,7 +34,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>

49
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingActionPanel.java
View file

@ -66,7 +66,7 @@ public class SwingActionPanel extends JPanel implements VascEntryFrontendEventLi
result.add(new JLabel("Row Numbers: "));
rowNumberField = new JTextField(6);
rowNumberField.addActionListener(this);
rowNumberField.setText(""+vascEntry.getVascFrontendData().getVascEntryState().getVascBackendState().getPageSize());
rowNumberField.setText(""+vascEntry.getVascFrontendController().getVascEntryState().getVascBackendState().getPageSize());
result.add(rowNumberField);
result.add(new JLabel("Go to: "));
gotoDirectPage = new JComboBox();
@ -83,7 +83,7 @@ public class SwingActionPanel extends JPanel implements VascEntryFrontendEventLi
//add(result);
vascEntry.getVascFrontendData().addVascEntryFrontendEventListener(this);
vascEntry.getVascFrontendController().addVascEntryFrontendEventListener(this);
}
class DownloadListCellRenderer extends JLabel implements ListCellRenderer {
@ -105,14 +105,14 @@ public class SwingActionPanel extends JPanel implements VascEntryFrontendEventLi
}
if (rowNumberField.equals(event.getSource())) {
int pageSize = new Integer(rowNumberField.getText());
vascEntry.getVascFrontendData().getVascEntryState().getVascBackendState().setPageSize(pageSize);
vascEntry.getVascFrontendData().getVascFrontendActions().refreshData();
vascEntry.getVascFrontendController().getVascEntryState().getVascBackendState().setPageSize(pageSize);
vascEntry.getVascFrontendController().getVascFrontendActions().refreshData();
}
if (gotoDirectPage.equals(event.getSource())) {
if (gotoDirectPage.getSelectedIndex()==0) {
return;
}
vascEntry.getVascFrontendData().getVascFrontendActions().pageAction(gotoDirectPage.getSelectedIndex() - 1);
vascEntry.getVascFrontendController().getVascFrontendActions().pageAction(gotoDirectPage.getSelectedIndex() - 1);
gotoDirectPage.setSelectedIndex(0);
}
if (gotoDownload.equals(event.getSource())) {
@ -130,7 +130,7 @@ public class SwingActionPanel extends JPanel implements VascEntryFrontendEventLi
try {
action.doGlobalAction(vascEntry);
} catch (Exception e) {
vascEntry.getVascFrontendData().getVascFrontendHelper().handleException(vascEntry, e);
vascEntry.getVascFrontendController().getVascFrontendHelper().handleException(vascEntry, e);
}
// restore normal view for next request.
@ -160,10 +160,10 @@ public class SwingActionPanel extends JPanel implements VascEntryFrontendEventLi
init = 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));
rowNumberField.setText(""+pageSize);
@ -171,7 +171,7 @@ public class SwingActionPanel extends JPanel implements VascEntryFrontendEventLi
gotoDirectPage.removeAllItems();
gotoDirectPage.addItem("Goto...");
List<VascBackendPageNumber> pages = vascEntry.getVascFrontendData().getVascFrontendPager().getTablePagesFromBackend();
List<VascBackendPageNumber> pages = vascEntry.getVascFrontendController().getVascFrontendPager().getTablePagesFromBackend();
int i=0;
for (VascBackendPageNumber page:pages) {
//pages.setRowIndex(i);
@ -259,8 +259,33 @@ public class SwingActionPanel extends JPanel implements VascEntryFrontendEventLi
public GlobalVascAction clone() {
return this;
}
public Integer getOrder() {
// TODO Auto-generated method stub
return null;
}
public Boolean getView() {
// TODO Auto-generated method stub
return null;
}
public String getRolesView() {
// TODO Auto-generated method stub
return null;
}
public Object cloneCreate() throws CloneNotSupportedException {
// TODO Auto-generated method stub
return null;
}
public void cloneFields(Object cloneObject)
throws CloneNotSupportedException {
// TODO Auto-generated method stub
}
};
empty.setName("...");
gotoDownload.addItem(empty);
for (GlobalVascAction a:entry.getExportActions()) {

34
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingPagerPanel.java
View file

@ -51,14 +51,14 @@ public class SwingPagerPanel extends JPanel implements VascEntryFrontendEventLis
this.vascEntry=vascEntry;
result = new JPanel();
add(result);
vascEntry.getVascFrontendData().addVascEntryFrontendEventListener(this);
vascEntry.getVascFrontendController().addVascEntryFrontendEventListener(this);
}
public void actionPerformed(ActionEvent e) {
if (e.getSource() instanceof JButton) {
JButton but = (JButton)e.getSource();
Integer page = new Integer(but.getText());
vascEntry.getVascFrontendData().getVascFrontendActions().pageAction(page);
vascEntry.getVascFrontendController().getVascFrontendActions().pageAction(page);
}
}
@ -68,14 +68,14 @@ public class SwingPagerPanel extends JPanel implements VascEntryFrontendEventLis
this.next=next;
}
public void actionPerformed(ActionEvent e) {
int pageIndex = vascEntry.getVascFrontendData().getVascEntryState().getVascBackendState().getPageIndex();
int pageIndex = vascEntry.getVascFrontendController().getVascEntryState().getVascBackendState().getPageIndex();
if (next) {
if (vascEntry.getVascFrontendData().getVascFrontendPager().getHasPageNextAction()) {
vascEntry.getVascFrontendData().getVascFrontendActions().pageAction(pageIndex+1);
if (vascEntry.getVascFrontendController().getVascFrontendPager().getHasPageNextAction()) {
vascEntry.getVascFrontendController().getVascFrontendActions().pageAction(pageIndex+1);
}
} else {
if (vascEntry.getVascFrontendData().getVascFrontendPager().getHasPagePreviousAction()) {
vascEntry.getVascFrontendData().getVascFrontendActions().pageAction(pageIndex-1);
if (vascEntry.getVascFrontendController().getVascFrontendPager().getHasPagePreviousAction()) {
vascEntry.getVascFrontendController().getVascFrontendActions().pageAction(pageIndex-1);
}
}
}
@ -91,12 +91,12 @@ public class SwingPagerPanel extends JPanel implements VascEntryFrontendEventLis
result.removeAll();
if (entry.getVascFrontendData().getVascFrontendPager().getHasExtendedPageMode()) {
if (entry.getVascFrontendController().getVascFrontendPager().getHasExtendedPageMode()) {
JButton prev = new JButton("Previous");
prev.addActionListener(new NextAction(false));
prev.setEnabled(entry.getVascFrontendData().getVascFrontendPager().getHasPagePreviousAction());
prev.setEnabled(entry.getVascFrontendController().getVascFrontendPager().getHasPagePreviousAction());
result.add(prev);
List<VascBackendPageNumber> pages = entry.getVascFrontendData().getVascFrontendPager().getTablePagesExtendedBegin();
List<VascBackendPageNumber> pages = entry.getVascFrontendController().getVascFrontendPager().getTablePagesExtendedBegin();
for(VascBackendPageNumber page:pages) {
JButton but = new JButton(""+page.getPageNumber());
but.addActionListener(this);
@ -106,8 +106,8 @@ public class SwingPagerPanel extends JPanel implements VascEntryFrontendEventLis
result.add(but);
}
result.add(new JLabel("..."));
if (entry.getVascFrontendData().getVascFrontendPager().getHasExtendedPageModeCenter()) {
pages = entry.getVascFrontendData().getVascFrontendPager().getTablePagesExtendedCenter();
if (entry.getVascFrontendController().getVascFrontendPager().getHasExtendedPageModeCenter()) {
pages = entry.getVascFrontendController().getVascFrontendPager().getTablePagesExtendedCenter();
for(VascBackendPageNumber page:pages) {
JButton but = new JButton(""+page.getPageNumber());
but.addActionListener(this);
@ -118,7 +118,7 @@ public class SwingPagerPanel extends JPanel implements VascEntryFrontendEventLis
}
result.add(new JLabel("..."));
}
pages = entry.getVascFrontendData().getVascFrontendPager().getTablePagesExtendedEnd();
pages = entry.getVascFrontendController().getVascFrontendPager().getTablePagesExtendedEnd();
for(VascBackendPageNumber page:pages) {
JButton but = new JButton(""+page.getPageNumber());
but.addActionListener(this);
@ -128,15 +128,15 @@ public class SwingPagerPanel extends JPanel implements VascEntryFrontendEventLis
result.add(but);
}
JButton next = new JButton("Next");
next.setEnabled(entry.getVascFrontendData().getVascFrontendPager().getHasPageNextAction());
next.setEnabled(entry.getVascFrontendController().getVascFrontendPager().getHasPageNextAction());
next.addActionListener(new NextAction(true));
result.add(next);
} else {
JButton prev = new JButton("Previous");
prev.addActionListener(new NextAction(false));
prev.setEnabled(entry.getVascFrontendData().getVascFrontendPager().getHasPagePreviousAction());
prev.setEnabled(entry.getVascFrontendController().getVascFrontendPager().getHasPagePreviousAction());
result.add(prev);
List<VascBackendPageNumber> pages = entry.getVascFrontendData().getVascFrontendPager().getTablePagesNormal();
List<VascBackendPageNumber> pages = entry.getVascFrontendController().getVascFrontendPager().getTablePagesNormal();
for(VascBackendPageNumber page:pages) {
JButton but = new JButton(""+page.getPageNumber());
but.addActionListener(this);
@ -146,7 +146,7 @@ public class SwingPagerPanel extends JPanel implements VascEntryFrontendEventLis
result.add(but);
}
JButton next = new JButton("Next");
next.setEnabled(entry.getVascFrontendData().getVascFrontendPager().getHasPageNextAction());
next.setEnabled(entry.getVascFrontendController().getVascFrontendPager().getHasPageNextAction());
next.addActionListener(new NextAction(true));
result.add(next);
}

11
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingPanelFrame.java
View file

@ -60,13 +60,14 @@ public class SwingPanelFrame implements SwingPanelIntegration {
public void createNewVascView(VascEntry entry) throws Exception {
// define redering
JPanel panel = initVascView();
SwingVascFrontend render = new SwingVascFrontend(panel,this);
// render
render.initEntry(entry);
render.renderView();
entry.getVascFrontendData().addVascEntryFrontendEventListener(new VascEntryFrontendEventListener() {
entry.getVascFrontendController().addVascEntryFrontendEventListener(new VascEntryFrontendEventListener() {
private static final long serialVersionUID = -6801954395965101748L;
public void vascEvent(VascEntry entry, Object data) {
if (data instanceof Exception) {
@ -80,7 +81,7 @@ public class SwingPanelFrame implements SwingPanelIntegration {
});
// get data
entry.getVascFrontendData().getVascFrontendActions().refreshData();
entry.getVascFrontendController().getVascFrontendActions().refreshData();
openVascView(panel, entry);
}
@ -98,14 +99,12 @@ public class SwingPanelFrame implements SwingPanelIntegration {
JMenu vascMenu = new JMenu("Vasc Entries");
if (addVascMenu) {
for (final String id:entry.getVascFrontendData().getVascController().getVascEntryController().getVascEntryIds()) {
for (final String id:entry.getVascFrontendController().getVascController().getVascEntryController().getVascEntryIds()) {
JMenuItem item = new JMenuItem(id);
item.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
try {
VascEntry ee = entry.getVascFrontendData().getVascController().getVascEntryController().getVascEntryById(id).clone();
//TestModelEntry.fill(ee,entry.getVascFrontendData().getVascController());
DefaultVascFactory.fillVascEntryFrontend(ee, entry.getVascFrontendData().getVascController(), DefaultVascFactory.getDefaultVascFrontendData(null));
VascEntry ee = entry.getVascFrontendController().getVascController().getVascEntryController().getVascEntryById(id);
createNewVascView(ee);
} catch (Exception e1) {
e1.printStackTrace();

4
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingPanelTabbed.java
View file

@ -53,7 +53,7 @@ public class SwingPanelTabbed implements SwingPanelIntegration {
render.initEntry(entry);
render.renderView();
entry.getVascFrontendData().addVascEntryFrontendEventListener(new VascEntryFrontendEventListener() {
entry.getVascFrontendController().addVascEntryFrontendEventListener(new VascEntryFrontendEventListener() {
private static final long serialVersionUID = -6801954395965101748L;
public void vascEvent(VascEntry entry, Object data) {
if (data instanceof Exception) {
@ -67,7 +67,7 @@ public class SwingPanelTabbed implements SwingPanelIntegration {
});
// get data
entry.getVascFrontendData().getVascFrontendActions().refreshData();
entry.getVascFrontendController().getVascFrontendActions().refreshData();
openVascView(panel, entry);
}

24
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingVascEditDialog.java
View file

@ -37,11 +37,11 @@ import javax.swing.SpringLayout;
import net.forwardfire.vasc.core.VascController;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.VascEntryField;
import net.forwardfire.vasc.core.VascLinkEntry;
import net.forwardfire.vasc.core.VascEntryLink;
import net.forwardfire.vasc.core.VascEntryLocal;
import net.forwardfire.vasc.core.ui.VascColumnValueModelListener;
import net.forwardfire.vasc.core.ui.VascUIComponent;
import net.forwardfire.vasc.core.ui.VascValueModel;
import net.forwardfire.vasc.impl.DefaultVascFactory;
/**
* SwingVascEditDialog renders vasc entry edit dialog
@ -91,14 +91,14 @@ public class SwingVascEditDialog extends JPanel {
JPanel b = new JPanel();
b.setLayout(new SpringLayout());
for (final VascLinkEntry vle:entry.getVascLinkEntries()) {
for (final VascEntryLink vle:entry.getVascEntryLinks()) {
JButton but = new JButton(vle.getName());
but.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
try {
VascController vc = entry.getVascFrontendData().getVascController();
VascEntry ee = vc.getVascEntryController().getVascEntryById(vle.getVascEntryId()).clone();
DefaultVascFactory.fillVascEntryFrontend(ee, vc, DefaultVascFactory.getDefaultVascFrontendData(null));
VascController vc = entry.getVascFrontendController().getVascController();
VascEntryLocal ee = (VascEntryLocal)vc.getVascEntryController().getVascEntryById(vle.getVascEntryId());
vc.getVascEntryConfigController().configVascFrontendController(vc, ee);
// Set parameters
try {
@ -117,7 +117,7 @@ public class SwingVascEditDialog extends JPanel {
Object selectedValue = v.getVascEntryFieldValue().getValue(v, selected);
// set data parameter on new vasc entry
ee.getVascFrontendData().getVascEntryState().getVascBackendState().setDataParameter(parameterName, selectedValue);
ee.getVascFrontendController().getVascEntryState().getVascBackendState().setDataParameter(parameterName, selectedValue);
//System.out.println("Setting link parameter: "+parameterName+" with: "+selectedValue);
}
@ -177,7 +177,7 @@ public class SwingVascEditDialog extends JPanel {
column++;
if (i==0) {
entry.getVascFrontendData().addFieldVascUIComponents(c, editor,g);
entry.getVascFrontendController().addFieldVascUIComponents(c, editor,g);
}
}
}
@ -197,12 +197,12 @@ public class SwingVascEditDialog extends JPanel {
// return;
//}
result = bean;
entry.getVascFrontendData().getVascEntryState().setEntryDataObject(result);
entry.getVascFrontendController().getVascEntryState().setEntryDataObject(result);
if (entry.getVascFrontendData().getVascEntryState().isEditCreate()) {
entry.getVascFrontendData().getVascFrontendActions().persistObject();
if (entry.getVascFrontendController().getVascEntryState().isEditCreate()) {
entry.getVascFrontendController().getVascFrontendActions().persistObject();
} else {
entry.getVascFrontendData().getVascFrontendActions().mergeObject();
entry.getVascFrontendController().getVascFrontendActions().mergeObject();
}
panels.closeVascView(editView, SwingVascEditDialog.this.entry);

53
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingVascFrontend.java
View file

@ -61,6 +61,7 @@ import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
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;
@ -70,7 +71,7 @@ import net.forwardfire.vasc.core.ui.VascUIComponent;
import net.forwardfire.vasc.core.ui.VascValueModel;
import net.forwardfire.vasc.frontend.AbstractVascFrontend;
import net.forwardfire.vasc.frontend.VascFrontendData;
import net.forwardfire.vasc.frontend.VascFrontendController;
import net.forwardfire.vasc.frontend.swing.ui.SwingBoolean;
import net.forwardfire.vasc.frontend.swing.ui.SwingButton;
import net.forwardfire.vasc.frontend.swing.ui.SwingColorChooser;
@ -112,7 +113,7 @@ public class SwingVascFrontend extends AbstractVascFrontend {
* Add swing implmented ui components
*/
protected void addUiComponents() {
VascFrontendData vfd = getVascEntry().getVascFrontendData();
VascFrontendController vfd = getVascEntry().getVascFrontendController();
// required UI components
vfd.putVascUIComponent(VascUIComponent.VASC_LABEL,SwingLabel.class.getName());
@ -129,7 +130,7 @@ public class SwingVascFrontend extends AbstractVascFrontend {
public ImageIcon getImageIcon(String imageResource) {
/// TODO hack beter
String key = entry.getVascFrontendData().getVascEntryResourceResolver().getTextValue(imageResource);
String key = entry.getVascFrontendController().getVascEntryResourceResolver().getTextValue(imageResource);
//logger.fine("KEY======================="+key);
if (key.startsWith("vasc.entry")) {
@ -152,7 +153,7 @@ public class SwingVascFrontend extends AbstractVascFrontend {
public void renderEdit() throws Exception {
logger.fine("Rending Edit View");
Object rowBean = entry.getVascFrontendData().getVascEntryState().getEntryDataObject();
Object rowBean = entry.getVascFrontendController().getVascEntryState().getEntryDataObject();
String beanValue = rowBean.toString();
if (entry.getDisplayNameFieldId()!=null) {
VascEntryField v = entry.getVascEntryFieldById(entry.getDisplayNameFieldId());
@ -171,12 +172,12 @@ public class SwingVascFrontend extends AbstractVascFrontend {
JPanel editPanel = panels.initVascView();
SwingVascEditDialog dialog = new SwingVascEditDialog(this,editPanel,entry,rowBean,beanValue,panels);
entry.getVascFrontendData().getVascFrontendHelper().editReadOnlyUIComponents(entry);
entry.getVascFrontendController().getVascFrontendHelper().editReadOnlyUIComponents(entry);
panels.openVascView(editPanel,entry);
}
public void renderDelete() throws Exception {
Object rowBean = entry.getVascFrontendData().getVascEntryState().getEntryDataObject();
Object rowBean = entry.getVascFrontendController().getVascEntryState().getEntryDataObject();
String beanValue = rowBean.toString();
VascEntryField v = entry.getVascEntryFieldById(entry.getDisplayNameFieldId());
@ -196,7 +197,7 @@ public class SwingVascFrontend extends AbstractVascFrontend {
, null // Default button's label
);
if (response==JOptionPane.YES_OPTION) {
entry.getVascFrontendData().getVascFrontendActions().deleteObject();
entry.getVascFrontendController().getVascFrontendActions().deleteObject();
}
}
@ -225,7 +226,7 @@ public class SwingVascFrontend extends AbstractVascFrontend {
try {
exporter.doExport(out, entry);
} catch (Exception e) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry, e);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry, e);
} finally {
if (out!=null) {
out.close();
@ -305,7 +306,7 @@ public class SwingVascFrontend extends AbstractVascFrontend {
body.setLayout(new SpringLayout());
int column = 0;
try {
for(VascEntryField c:entry.getListOptions()) {
for(VascEntryListOption c:entry.getVascEntryListOptions()) {
for (int i=0;i<c.getVascEntryFieldType().getUIComponentCount(c);i++) {
VascUIComponent label = c.getVascEntryFieldType().provideLabelUIComponent(i,c);
@ -321,12 +322,12 @@ public class SwingVascFrontend extends AbstractVascFrontend {
column++;
if (i==0) {
entry.getVascFrontendData().addFieldVascUIComponents(c, editor,g);
entry.getVascFrontendController().addFieldVascUIComponents(c, editor,g);
}
body.add(new JLabel()); // fill :(
}
}
entry.getVascFrontendData().getVascFrontendHelper().headerOptionsCreatedFillData(entry);
entry.getVascFrontendController().getVascFrontendHelper().headerOptionsCreatedFillData(entry);
// add search
column++;
@ -337,14 +338,14 @@ public class SwingVascFrontend extends AbstractVascFrontend {
searchField.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
String searchText = searchField.getText();
entry.getVascFrontendData().getVascFrontendActions().searchAction(searchText);
entry.getVascFrontendController().getVascFrontendActions().searchAction(searchText);
}
});
JButton searchButton = new JButton("Search");
searchButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
String searchText = searchField.getText();
entry.getVascFrontendData().getVascFrontendActions().searchAction(searchText);
entry.getVascFrontendController().getVascFrontendActions().searchAction(searchText);
}
});
body.add(searchButton);
@ -414,15 +415,15 @@ public class SwingVascFrontend extends AbstractVascFrontend {
table.addMouseListener(new MouseAdapter() {
public void mousePressed(MouseEvent e) {
if (e.getClickCount() == 2) {
Object o = entry.getVascFrontendData().getVascEntryState().getEntryDataObject();
Object o = entry.getVascFrontendController().getVascEntryState().getEntryDataObject();
if (o==null) {
return;
}
try {
// todo: fix
entry.getVascFrontendData().getVascFrontend().renderEdit();
entry.getVascFrontendController().getVascFrontend().renderEdit();
} catch (Exception ee) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry, ee);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry, ee);
}
}
}
@ -444,13 +445,13 @@ public class SwingVascFrontend extends AbstractVascFrontend {
int columnModelIndex = colModel.getColumnIndexAtX(e.getX());
TableColumn tc = colModel.getColumn(columnModelIndex);
VascEntryField field = (VascEntryField)tc.getHeaderValue();
entry.getVascFrontendData().getVascFrontendActions().sortAction(field);
sortOrder = entry.getVascFrontendData().getVascEntryState().getVascBackendState().isSortAscending();
entry.getVascFrontendController().getVascFrontendActions().sortAction(field);
sortOrder = entry.getVascFrontendController().getVascEntryState().getVascBackendState().isSortAscending();
sortField = field.getId();
try {
entry.getVascFrontendData().getVascFrontend().renderView();
entry.getVascFrontendController().getVascFrontend().renderView();
} catch (Exception ee) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry, ee);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry, ee);
}
table.repaint();
}
@ -494,10 +495,10 @@ public class SwingVascFrontend extends AbstractVascFrontend {
if (rowIndex!=-1) {
// temp; gets index by sorter
//rowIndex = tableSorter.modelIndex(rowIndex);
Object data = entry.getVascFrontendData().getVascEntryState().getEntryDataList().get(rowIndex);
entry.getVascFrontendData().getVascEntryState().setEntryDataObject(data);
Object data = entry.getVascFrontendController().getVascEntryState().getEntryDataList().get(rowIndex);
entry.getVascFrontendController().getVascEntryState().setEntryDataObject(data);
} else {
entry.getVascFrontendData().getVascEntryState().setEntryDataObject(null);
entry.getVascFrontendController().getVascEntryState().setEntryDataObject(null);
}
}
}
@ -570,9 +571,9 @@ public class SwingVascFrontend extends AbstractVascFrontend {
public void actionPerformed(ActionEvent 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);
}
}
}
@ -590,7 +591,7 @@ public class SwingVascFrontend extends AbstractVascFrontend {
try {
action.doGlobalAction(entry);
} catch (Exception e) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry,e);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry,e);
}
}
}

14
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingVascTableModel.java
View file

@ -44,7 +44,7 @@ public class SwingVascTableModel extends AbstractTableModel implements VascEntry
public SwingVascTableModel(VascEntry entry) {
this.entry=entry;
entry.getVascFrontendData().addVascEntryFrontendEventListener(this);
entry.getVascFrontendController().addVascEntryFrontendEventListener(this);
}
public void vascEvent(VascEntry entry,Object o) {
@ -55,9 +55,9 @@ public class SwingVascTableModel extends AbstractTableModel implements VascEntry
* @see javax.swing.entry.entryModel#getColumnCount()
*/
public int getColumnCount() {
int result = 0;
int result = 0;
for(VascEntryField c:entry.getVascEntryFields()) {
if (c.getList()==false) {
if (c.getList()!=null && c.getList()==false) {
continue;
}
result++;
@ -69,22 +69,22 @@ public class SwingVascTableModel extends AbstractTableModel implements VascEntry
* @see javax.swing.entry.entryModel#getRowCount()
*/
public int getRowCount() {
if (entry.getVascFrontendData().getVascEntryState().getEntryDataList()==null) {
if (entry.getVascFrontendController().getVascEntryState().getEntryDataList()==null) {
return 0;
}
return entry.getVascFrontendData().getVascEntryState().getEntryDataList().size();
return entry.getVascFrontendController().getVascEntryState().getEntryDataList().size();
}
/**
* @see javax.swing.entry.entryModel#getValueAt(int, int)
*/
public Object getValueAt(int rowIndex, int columnIndex) {
Object bean = entry.getVascFrontendData().getVascEntryState().getEntryDataList().get(rowIndex);
Object bean = entry.getVascFrontendController().getVascEntryState().getEntryDataList().get(rowIndex);
// TODO: this is slowing....
List<VascEntryField> list = new ArrayList<VascEntryField>();
for(VascEntryField c:entry.getVascEntryFields()) {
if (c.getList()==false) {
if (c.getList()!=null && c.getList()==false) {
continue;
}

2
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/ui/SwingBoolean.java
View file

@ -130,7 +130,7 @@ class SelectActionListener implements ActionListener {
try {
model.setValue(value);
} catch (Exception ee) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry,ee);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry,ee);
}
}
}

4
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/ui/SwingColorChooser.java
View file

@ -140,7 +140,7 @@ class SelectActionListener3 implements ActionListener {
try {
model.setValue(newColor);
} catch (Exception ee) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry,ee);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry,ee);
}
} else {
String cur=null;
@ -159,7 +159,7 @@ class SelectActionListener3 implements ActionListener {
String newColorString = "#"+Integer.toHexString( newColor.getRGB() & 0x00ffffff );
model.setValue(newColorString);
} catch (Exception ee) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry,ee);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry,ee);
}
}
}

2
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/ui/SwingDate.java
View file

@ -133,7 +133,7 @@ class SelectActionListener2 implements ActionListener {
try {
model.setValue(value);
} catch (Exception ee) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry,ee);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry,ee);
}
}
}

2
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/ui/SwingList.java
View file

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

7
vasc-frontend/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/SwingTest.java
View file

@ -23,11 +23,10 @@
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.swing.SwingPanelFrame;
import net.forwardfire.vasc.frontend.swing.SwingPanelIntegration;
import net.forwardfire.vasc.impl.DefaultVascFactory;
import net.forwardfire.vasc.test.frontend.data.TestModelData;
import junit.framework.TestCase;
@ -60,8 +59,8 @@ public class SwingTest extends TestCase {
VascController vc = testData.getTestVascController();
testData.createVascEntries(vc,(VascEntryControllerLocal)vc.getVascEntryController());
VascEntry ve = testData.getTestEntry(vc);
DefaultVascFactory.fillVascEntryFrontend(ve, vc, DefaultVascFactory.getDefaultVascFrontendData(null));
VascEntryLocal ve = testData.getTestEntry(vc);
vc.getVascEntryConfigController().configVascFrontendController(vc, ve);
spi.createNewVascView(ve);
}
}

11
vasc-frontend/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/SwingTestTabbed.java
View file

@ -35,6 +35,7 @@ import javax.swing.JTabbedPane;
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.swing.SwingPanelIntegration;
import net.forwardfire.vasc.frontend.swing.SwingPanelTabbed;
import net.forwardfire.vasc.impl.DefaultVascFactory;
@ -85,9 +86,9 @@ public class SwingTestTabbed extends TestCase {
item.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
try {
VascEntry ee = vc.getVascEntryController().getVascEntryById(id).clone();
DefaultVascFactory.fillVascEntryFrontend(ee, vc, DefaultVascFactory.getDefaultVascFrontendData(null));
spi.createNewVascView(ee);
VascEntryLocal ve = (VascEntryLocal)vc.getVascEntryController().getVascEntryById(id);
vc.getVascEntryConfigController().configVascFrontendController(vc, ve);
spi.createNewVascView(ve);
} catch (Exception e1) {
e1.printStackTrace();
}
@ -114,8 +115,8 @@ public class SwingTestTabbed extends TestCase {
frame.pack();
frame.setVisible(true);
VascEntry ve = testData.getTestEntry(vc);
DefaultVascFactory.fillVascEntryFrontend(ve, vc, DefaultVascFactory.getDefaultVascFrontendData(null));
VascEntryLocal ve = testData.getTestEntry(vc);
vc.getVascEntryConfigController().configVascFrontendController(vc, ve);
spi.createNewVascView(ve);
}
}

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();

2
vasc-frontend/vasc-frontend-web-export/pom.xml
View file

@ -24,7 +24,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<version>${servlet-api.version}</version>
<type>jar</type>
<scope>provided</scope>
</dependency>

55
vasc-frontend/vasc-frontend-web-export/src/main/java/net/forwardfire/vasc/frontend/web/export/VascExportServlet.java
View file

@ -35,6 +35,7 @@ import javax.servlet.http.HttpServletResponse;
import net.forwardfire.vasc.core.VascController;
import net.forwardfire.vasc.core.VascControllerProvider;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.VascEntryLocal;
import net.forwardfire.vasc.core.VascException;
import net.forwardfire.vasc.core.entry.VascEntryExporter;
@ -49,7 +50,7 @@ public class VascExportServlet extends HttpServlet {
private Logger logger = Logger.getLogger(VascExportServlet.class.getName());
private static final long serialVersionUID = 6165530418422144322L;
private VascControllerProvider vascControllerProvider = null;
private boolean exportTree = false;
private boolean forceTree = false;
/**
* @see javax.servlet.GenericServlet#init()
@ -61,9 +62,15 @@ public class VascExportServlet extends HttpServlet {
if (className==null) {
throw new ServletException("Can't start with null vascControllerProvider init parameter.");
}
String exportTreeStr = getInitParameter("exportTree");
String exportTreeStr = getInitParameter("forceTree");
if (exportTreeStr!=null && "true".equalsIgnoreCase(exportTreeStr)) {
exportTree = true;
forceTree = true;
}
String classArgument = null;
int atIndex = className.indexOf('@');
if (atIndex > 0) {
classArgument = className.substring(0,atIndex);
className = className.substring(atIndex+1);
}
try {
ClassLoader cl = Thread.currentThread().getContextClassLoader();
@ -71,11 +78,15 @@ public class VascExportServlet extends HttpServlet {
cl = className.getClass().getClassLoader();
}
Class<?> clazz = cl.loadClass(className);
vascControllerProvider = (VascControllerProvider)clazz.newInstance();
if (classArgument==null) {
vascControllerProvider = (VascControllerProvider)clazz.newInstance();
} else {
vascControllerProvider = (VascControllerProvider)clazz.getConstructor(String.class).newInstance(classArgument);
}
} catch (Exception e) {
throw new ServletException("Could not create VascControllerProvider: "+e.getMessage(),e);
}
logger.info("Export servlet started. (exportTree: "+exportTree+")");
logger.info("Export servlet started with forceTree: "+forceTree+" prov: "+classArgument+"@"+className);
}
/**
@ -102,8 +113,13 @@ public class VascExportServlet extends HttpServlet {
String entryId = null;
String exportId = null;
if (exportTree) {
int index = path.indexOf("/");
int index = path.indexOf("/");
if (forceTree && index<0) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Only tree request allowed.");
return;
}
if (index>0) {
String actionString = null;
if (index>0) {
actionString = path.substring(index+1);
@ -135,16 +151,33 @@ public class VascExportServlet extends HttpServlet {
exportId = request.getParameter("et");
}
if (entryId==null) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST, "No entry given");
return;
}
if (entryId.isEmpty()) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST, "No entry given");
return;
}
if (exportId==null) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST, "No export type given");
return;
}
if (exportId.isEmpty()) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST, "No export type given");
return;
}
//out = new PrintWriter(new OutputStreamWriter(response.getOutputStream(), response.getCharacterEncoding()), true);
OutputStream out = response.getOutputStream();
try {
VascController vc = vascControllerProvider.getVascController();
VascEntry ve = vc.getVascEntryConfigController().configVascEntry(vc, entryId);
vc.getVascEntryConfigController().configVascFrontendData(vc, ve, new Locale("en"));
VascEntryLocal ve = (VascEntryLocal)vc.getVascEntryConfigController().configVascEntry(vc, entryId);
vc.getVascEntryConfigController().configVascFrontendController(vc, ve);
// Update total every time first
Long total = ve.getVascFrontendData().getVascEntryState().getVascBackend().fetchTotalExecuteSize(ve.getVascFrontendData().getVascEntryState().getVascBackendState());
ve.getVascFrontendData().getVascEntryState().setTotalBackendRecords(total);
Long total = ve.getVascFrontendController().getVascEntryState().getVascBackend().fetchTotalExecuteSize(ve.getVascFrontendController().getVascEntryState().getVascBackendState());
ve.getVascFrontendController().getVascEntryState().setTotalBackendRecords(total);
VascEntryExporter ex = vc.getVascEntryConfigController().getVascEntryExporterById(exportId);
String filename = entryId+"-export."+ex.getFileType();

38
vasc-frontend/vasc-frontend-web-jsf/pom.xml
View file

@ -20,46 +20,30 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>1.2</version>
<scope>provided</scope>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${servlet-api.version}</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
<version>${jstl.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.1</version>
<version>${jsp-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
<version>1.2_04</version>
<groupId>org.glassfish</groupId>
<artifactId>javax.faces</artifactId>
<version>${javax.faces.version}</version>
<scope>provided</scope>
</dependency>
<!-- tomahak jsf frontend
<dependency>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk12</artifactId>
<version>1.1.8</version>
<scope>compile</scope>
</dependency>
-->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

30
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/AbstractJSFVascFacesControllerBase.java
View file

@ -29,7 +29,8 @@ import net.forwardfire.vasc.backend.VascBackendState;
import net.forwardfire.vasc.core.VascController;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.VascEntryField;
import net.forwardfire.vasc.frontend.VascFrontendData;
import net.forwardfire.vasc.core.VascEntryLocal;
import net.forwardfire.vasc.frontend.VascFrontendController;
import net.forwardfire.vasc.impl.DefaultVascFactory;
/**
@ -40,7 +41,7 @@ import net.forwardfire.vasc.impl.DefaultVascFactory;
*/
public abstract class AbstractJSFVascFacesControllerBase {
abstract public VascFrontendData getNewVascFrontendData();
abstract public VascFrontendController getNewVascFrontendData();
abstract public VascController getVascController();
public void setVascController(VascController vascController) {
@ -52,18 +53,24 @@ public abstract class AbstractJSFVascFacesControllerBase {
public List<Object> executeVascList(String entryId,Map<String,Object> para) {
try {
// plug all object
VascEntry entry = getVascController().getVascEntryController().getVascEntryById(entryId);
DefaultVascFactory.fillVascEntryFrontend(entry, getVascController(), getNewVascFrontendData());
VascEntryLocal entry = (VascEntryLocal)getVascController().getVascEntryController().getVascEntryById(entryId);
getVascController().getVascEntryConfigController().configVascFrontendController(getVascController(), entry);
// set def para
VascBackendState state = entry.getVascFrontendData().getVascEntryState().getVascBackendState();
VascBackendState state = entry.getVascFrontendController().getVascEntryState().getVascBackendState();
for (String key2:entry.getEntryParameterKeys()) {
Object value = entry.getEntryParameter(key2);
state.setDataParameter(key2, value);
}
// copy para
if (para!=null) {
for (String key:para.keySet()) {
state.setDataParameter(key, para.get(key));
}
}
// set list para
for (VascEntryField vef:entry.getListOptions()) {
for (VascEntryField vef:entry.getVascEntryListOptions()) {
Object def = vef.getDefaultValue();
if (def==null) {
continue;
@ -72,16 +79,9 @@ public abstract class AbstractJSFVascFacesControllerBase {
state.setDataParameter(backendName, def);
}
// copy para
if (para!=null) {
for (String key:para.keySet()) {
entry.setEntryParameter(key, para.get(key));
}
}
// done, execute and return data.
entry.getVascFrontendData().getVascFrontendActions().refreshData();
return entry.getVascFrontendData().getVascEntryState().getEntryDataList();
entry.getVascFrontendController().getVascFrontendActions().refreshData();
return entry.getVascFrontendController().getVascEntryState().getEntryDataList();
} catch (Exception e) {
throw new RuntimeException("Could not execute list: "+e.getMessage(),e);
}

26
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/AbstractJSFVascFacesControllerEJB.java
View file

@ -45,12 +45,13 @@ import net.forwardfire.vasc.core.VascController;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.VascEntryControllerLocal;
import net.forwardfire.vasc.core.VascEntryField;
import net.forwardfire.vasc.core.VascEntryLocal;
import net.forwardfire.vasc.core.VascException;
import net.forwardfire.vasc.core.entry.VascEntryFieldValue;
import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener;
import net.forwardfire.vasc.core.entry.VascEntryRecordCreator;
import net.forwardfire.vasc.ejb3.VascServiceManager;
import net.forwardfire.vasc.frontend.VascFrontendData;
import net.forwardfire.vasc.frontend.VascFrontendController;
import net.forwardfire.vasc.impl.DefaultVascFactory;
import net.forwardfire.vasc.impl.entry.DefaultVascEntryResourceResolver;
import net.forwardfire.vasc.impl.entry.SetParameterBackendListener;
@ -125,9 +126,8 @@ abstract public class AbstractJSFVascFacesControllerEJB extends AbstractJSFVascF
/**
* Config vasc frontend data object for jsf component to use.
*
* @return
*/
public VascFrontendData getNewVascFrontendData() {
public VascFrontendController getNewVascFrontendData() {
Locale locale = FacesContext.getCurrentInstance().getViewRoot().getLocale();
MergedResourceBundle bundle = new MergedResourceBundle();
bundle.addDataBundle(ResourceBundle.getBundle(getResourceBundleWEB(), locale));
@ -141,7 +141,7 @@ abstract public class AbstractJSFVascFacesControllerEJB extends AbstractJSFVascF
throw new RuntimeException("Could not get the ejb resource bundle: "+e.getMessage(),e);
}
VascFrontendData vascFrontendData = DefaultVascFactory.getDefaultVascFrontendData(bundle);
VascFrontendController vascFrontendData = DefaultVascFactory.getDefaultVascFrontendData(bundle);
vascFrontendData.addVascEntryFrontendEventListener(new VascEntryFrontendEventListener() {
private static final long serialVersionUID = 1L;
public VascFrontendEventType[] getEventTypes() {
@ -154,7 +154,7 @@ abstract public class AbstractJSFVascFacesControllerEJB extends AbstractJSFVascF
}
}
});
// config frontend data for ISF usage
if (getDisableI18N()) {
vascFrontendData.setVascEntryResourceResolver(new DefaultVascEntryResourceResolver());
@ -163,7 +163,9 @@ abstract public class AbstractJSFVascFacesControllerEJB extends AbstractJSFVascF
}
return vascFrontendData;
}
* @return
*/
class RemoteVascBackend implements VascBackend {
@ -279,10 +281,10 @@ abstract public class AbstractJSFVascFacesControllerEJB extends AbstractJSFVascF
}
public VascEntryRecordCreator provideVascEntryRecordCreator(VascEntry vascEntry) {
VascEntry clone = null;
VascEntryLocal clone = null;
try {
clone = vascEntry.clone();
clone.setVascFrontendData(null);
clone = ((VascEntryLocal)vascEntry).clone();
clone.setVascFrontendController(null);
clone.setVascEntryFieldEventChannel(null);
} catch (CloneNotSupportedException e) {
// TODO Auto-generated catch block
@ -345,7 +347,7 @@ abstract public class AbstractJSFVascFacesControllerEJB extends AbstractJSFVascF
// get local jvm plugging controller
VascController c = DefaultVascFactory.getDefaultVascController(vui.userId, vui.username, vui.roles);
VascController c = DefaultVascFactory.getDefaultVascController();
/*
DefaultVascEntryController con = new DefaultVascEntryController() {
@ -366,7 +368,7 @@ abstract public class AbstractJSFVascFacesControllerEJB extends AbstractJSFVascF
VascEntryControllerLocal localEntryController = (VascEntryControllerLocal)c.getVascEntryController();
VascBackendControllerLocal localBackendController = (VascBackendControllerLocal)c.getVascBackendController();
for (String id:entryIds) {
VascEntry ve = vascManager.getVascEntry(id);
VascEntryLocal ve = (VascEntryLocal)vascManager.getVascEntry(id);
String backendId = ve.getBackendId();
VascBackend vb = new RemoteVascBackend(backendId,vascManager);

15
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/AbstractJSFVascFacesControllerLocal.java
View file

@ -36,7 +36,7 @@ import net.forwardfire.vasc.core.VascController;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.VascEntryControllerLocal;
import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener;
import net.forwardfire.vasc.frontend.VascFrontendData;
import net.forwardfire.vasc.frontend.VascFrontendController;
import net.forwardfire.vasc.impl.DefaultVascFactory;
import net.forwardfire.vasc.impl.entry.DefaultVascEntryResourceResolver;
import net.forwardfire.vasc.impl.x4o.VascParser;
@ -93,15 +93,13 @@ abstract public class AbstractJSFVascFacesControllerLocal extends AbstractJSFVas
/**
* Config vasc frontend data object for jsf component to use.
*
* @return
*/
public VascFrontendData getNewVascFrontendData() {
public VascFrontendController getNewVascFrontendData() {
Locale locale = FacesContext.getCurrentInstance().getViewRoot().getLocale();
MergedResourceBundle bundle = new MergedResourceBundle();
bundle.addDataBundle(ResourceBundle.getBundle(getResourceBundleWEB(), locale));
VascFrontendData vascFrontendData = DefaultVascFactory.getDefaultVascFrontendData(bundle);
VascFrontendController vascFrontendData = DefaultVascFactory.getDefaultVascFrontendData(bundle);
vascFrontendData.addVascEntryFrontendEventListener(new VascEntryFrontendEventListener() {
private static final long serialVersionUID = 1L;
public VascFrontendEventType[] getEventTypes() {
@ -123,6 +121,9 @@ abstract public class AbstractJSFVascFacesControllerLocal extends AbstractJSFVas
}
return vascFrontendData;
}
*
* @return
*/
/**
* @return the vascController
@ -134,7 +135,7 @@ abstract public class AbstractJSFVascFacesControllerLocal extends AbstractJSFVas
try {
// get local jvm plugging controller
VascUserInfo vui = getVascUserInfo();
VascController c = DefaultVascFactory.getDefaultVascController(vui.userId, vui.username, vui.roles);
VascController c = DefaultVascFactory.getDefaultVascController();
// Load vasc resources
for (String res:getVascParseResources()) {

4
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascEntryEventListener.java
View file

@ -74,7 +74,7 @@ public class JSFVascEntryEventListener implements VascEntryFrontendEventListener
throw new RuntimeException(e);
}
*/
List<Object> data = entry.getVascFrontendData().getVascEntryState().getEntryDataList();
List<Object> data = entry.getVascFrontendController().getVascEntryState().getEntryDataList();
List<Object> result = new ArrayList<Object>(data.size());
int index = 0;
for (Object o:data) {
@ -86,6 +86,6 @@ public class JSFVascEntryEventListener implements VascEntryFrontendEventListener
ValueExpression ve2 = FacesContext.getCurrentInstance().getApplication().getExpressionFactory().createValueExpression(FacesContext.getCurrentInstance().getELContext(), "#{"+entrySupportVar+".tableDataModel.wrappedData}", Object.class);
ve2.setValue(FacesContext.getCurrentInstance().getELContext(), result);
ValueExpression ve3 = FacesContext.getCurrentInstance().getApplication().getExpressionFactory().createValueExpression(FacesContext.getCurrentInstance().getELContext(), "#{"+entrySupportVar+".tablePagesDataModel.wrappedData}", Object.class);
ve3.setValue(FacesContext.getCurrentInstance().getELContext(), entry.getVascFrontendData().getVascFrontendPager().getTablePagesFromBackend());
ve3.setValue(FacesContext.getCurrentInstance().getELContext(), entry.getVascFrontendController().getVascFrontendPager().getTablePagesFromBackend());
}
}

194
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascEntrySupportBean.java
View file

@ -52,8 +52,8 @@ import net.forwardfire.vasc.backend.VascBackendPageNumber;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.VascEntryField;
import net.forwardfire.vasc.core.VascEntryState;
import net.forwardfire.vasc.core.VascLinkEntry;
import net.forwardfire.vasc.core.VascLinkEntryType;
import net.forwardfire.vasc.core.VascEntryLink;
import net.forwardfire.vasc.core.VascEntryLinkType;
import net.forwardfire.vasc.core.actions.GlobalVascAction;
import net.forwardfire.vasc.core.actions.RowVascAction;
import net.forwardfire.vasc.core.entry.VascEntryExporter;
@ -104,7 +104,7 @@ public class JSFVascEntrySupportBean implements Serializable {
editSelectItemModels = new HashMap<String,Object>(6);
// cache some values
VascBackend backend = entry.getVascFrontendData().getVascEntryState().getVascBackend();
VascBackend backend = entry.getVascFrontendController().getVascEntryState().getVascBackend();
backendPageable = backend.isPageable();
backendMoveable = backend.isRecordMoveable();
backendSearchable = backend.isSearchable();
@ -134,11 +134,11 @@ public class JSFVascEntrySupportBean implements Serializable {
}
public String getParentSelectedDisplayName() {
return entry.getVascFrontendData().getVascFrontendHelper().getParentSelectedDisplayName(entry);
return entry.getVascFrontendController().getVascFrontendHelper().getParentSelectedDisplayName(entry);
}
public String getSelectedDisplayName() {
return entry.getVascFrontendData().getVascFrontendHelper().getSelectedDisplayName(entry);
return entry.getVascFrontendController().getVascFrontendHelper().getSelectedDisplayName(entry);
}
public int getTotalColumnCount() {
@ -155,7 +155,7 @@ public class JSFVascEntrySupportBean implements Serializable {
t++; // auto add of select boxes
}
for (VascEntryField c:entry.getVascEntryFields()) {
if (entry.getVascFrontendData().getVascFrontendHelper().renderList(c)==false) {
if (entry.getVascFrontendController().getVascFrontendDataSelector().isFieldList(c)==false) {
continue;
}
t++;
@ -165,7 +165,7 @@ public class JSFVascEntrySupportBean implements Serializable {
public int getTotalActionColumnCount() {
int t = 0;
if (entry.getVascFrontendData().getVascEntryState().getVascBackend().isRecordMoveable()) {
if (entry.getVascFrontendController().getVascEntryState().getVascBackend().isRecordMoveable()) {
t++;
t++;
}
@ -177,33 +177,33 @@ public class JSFVascEntrySupportBean implements Serializable {
return getVascLinkEntriesList().size();
}
public List<VascLinkEntry> getVascLinkEntriesList() {
return entry.getVascFrontendData().getVascFrontendHelper().getVascLinkEntryByType(entry,VascLinkEntryType.LIST);
public List<VascEntryLink> getVascLinkEntriesList() {
return entry.getVascFrontendController().getVascFrontendHelper().getVascLinkEntryByType(entry,VascEntryLinkType.LIST);
}
public List<VascLinkEntry> getVascLinkEntriesEditTab() {
return entry.getVascFrontendData().getVascFrontendHelper().getVascLinkEntryByType(entry,VascLinkEntryType.EDIT_TAB);
public List<VascEntryLink> getVascLinkEntriesEditTab() {
return entry.getVascFrontendController().getVascFrontendHelper().getVascLinkEntryByType(entry,VascEntryLinkType.EDIT_TAB);
}
public List<VascLinkEntry> getVascLinkEntriesEditInline() {
return entry.getVascFrontendData().getVascFrontendHelper().getVascLinkEntryByType(entry,VascLinkEntryType.EDIT_INLINE);
public List<VascEntryLink> getVascLinkEntriesEditInline() {
return entry.getVascFrontendController().getVascFrontendHelper().getVascLinkEntryByType(entry,VascEntryLinkType.EDIT_INLINE);
}
public List<VascLinkEntry> getVascLinkEntriesEditTabParentState() {
if (entry.getVascFrontendData().getVascEntryState().getParent()==null) {
List<VascLinkEntry> result = new ArrayList<VascLinkEntry>(0);
public List<VascEntryLink> getVascLinkEntriesEditTabParentState() {
if (entry.getVascFrontendController().getVascEntryState().getParent()==null) {
List<VascEntryLink> result = new ArrayList<VascEntryLink>(0);
return result;
}
return entry.getVascFrontendData().getVascFrontendHelper().getVascLinkEntryByType(entry.getVascFrontendData().getVascEntryState().getParent().getVascEntry(),VascLinkEntryType.EDIT_TAB);
return entry.getVascFrontendController().getVascFrontendHelper().getVascLinkEntryByType(entry.getVascFrontendController().getVascEntryState().getParent().getVascEntry(),VascEntryLinkType.EDIT_TAB);
}
public long getPageTotalRecordCount() {
return entry.getVascFrontendData().getVascFrontendPager().getPageTotalRecordCount();
return entry.getVascFrontendController().getVascFrontendPager().getPageTotalRecordCount();
}
public long getPageStartCount() {
return entry.getVascFrontendData().getVascFrontendPager().getPageStartCount();
return entry.getVascFrontendController().getVascFrontendPager().getPageStartCount();
}
public long getPageStopCount() {
return entry.getVascFrontendData().getVascFrontendPager().getPageStopCount();
return entry.getVascFrontendController().getVascFrontendPager().getPageStopCount();
}
public List<SelectItem> getGlobalExportItems() {
@ -232,7 +232,7 @@ public class JSFVascEntrySupportBean implements Serializable {
s.setValue("null");
result.add(s);
int pageSize = getVascEntry().getVascFrontendData().getVascEntryState().getVascBackendState().getPageSize();
int pageSize = getVascEntry().getVascFrontendController().getVascEntryState().getVascBackendState().getPageSize();
for (int i=0;i<getTablePagesDataModel().getRowCount();i++) {
getTablePagesDataModel().setRowIndex(i);
VascBackendPageNumber page = (VascBackendPageNumber)getTablePagesDataModel().getRowData();
@ -249,27 +249,27 @@ public class JSFVascEntrySupportBean implements Serializable {
}
public boolean getHasOnlySinglePage() {
return entry.getVascFrontendData().getVascFrontendPager().getHasOnlySinglePage();
return entry.getVascFrontendController().getVascFrontendPager().getHasOnlySinglePage();
}
public boolean getHasExtendedPageMode() {
return entry.getVascFrontendData().getVascFrontendPager().getHasExtendedPageMode();
return entry.getVascFrontendController().getVascFrontendPager().getHasExtendedPageMode();
}
public boolean getHasExtendedPageModeCenter() {
return entry.getVascFrontendData().getVascFrontendPager().getHasExtendedPageModeCenter();
return entry.getVascFrontendController().getVascFrontendPager().getHasExtendedPageModeCenter();
}
public List<VascBackendPageNumber> getTablePagesExtendedBegin() {
return entry.getVascFrontendData().getVascFrontendPager().getTablePagesExtendedBegin();
return entry.getVascFrontendController().getVascFrontendPager().getTablePagesExtendedBegin();
}
public List<VascBackendPageNumber> getTablePagesExtendedEnd() {
return entry.getVascFrontendData().getVascFrontendPager().getTablePagesExtendedEnd();
return entry.getVascFrontendController().getVascFrontendPager().getTablePagesExtendedEnd();
}
public List<VascBackendPageNumber> getTablePagesExtendedCenter() {
return entry.getVascFrontendData().getVascFrontendPager().getTablePagesExtendedCenter();
return entry.getVascFrontendController().getVascFrontendPager().getTablePagesExtendedCenter();
}
private String getComponentType(UIComponent comp) {
@ -285,10 +285,10 @@ public class JSFVascEntrySupportBean implements Serializable {
public List<RowVascAction> getParentCustomRowActions() {
List<RowVascAction> result = new ArrayList<RowVascAction>(5);
VascEntry entry = getVascEntry();
if (entry.getVascFrontendData().getVascEntryState().getParent()==null) {
if (entry.getVascFrontendController().getVascEntryState().getParent()==null) {
return result;
}
VascEntry parent = entry.getVascFrontendData().getVascEntryState().getParent().getVascEntry();
VascEntry parent = entry.getVascFrontendController().getVascEntryState().getParent().getVascEntry();
for (RowVascAction action:parent.getRowActions()) {
String actionId = action.getId();
if (AddRowAction.ACTION_ID.equals(actionId)) {
@ -310,25 +310,25 @@ public class JSFVascEntrySupportBean implements Serializable {
logger.fine("parentCustomRowaction: "+actionIdString);
JSFVascUIComponent comp = JSFVascUIComponent.findVascParent(event.getComponent());
VascEntry entry = comp.getVascEntry();
if (entry.getVascFrontendData().getVascEntryState().getParent()==null) {
if (entry.getVascFrontendController().getVascEntryState().getParent()==null) {
return;
}
VascEntry parent = entry.getVascFrontendData().getVascEntryState().getParent().getVascEntry();
VascEntry parent = entry.getVascFrontendController().getVascEntryState().getParent().getVascEntry();
RowVascAction action = parent.getRowActionById(actionIdString);
Object parentSelected = entry.getVascFrontendData().getVascEntryState().getParent().getEntryDataObject();
Object parentSelected = entry.getVascFrontendController().getVascEntryState().getParent().getEntryDataObject();
logger.fine("parentCustomRowaction do on: "+action+" parentSelection: "+parentSelected);
try {
action.doRowAction(parent,parentSelected);
} catch (Exception e) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry, e);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry, e);
}
logger.fine("parentCustomRowaction DONE");
}
public boolean getHasMultiRowActions() {
int size = getVascEntry().getVascFrontendData().getVascFrontendHelper().getMultiRowActions(getVascEntry()).size();
int size = getVascEntry().getVascFrontendController().getVascFrontendHelper().getMultiRowActions(getVascEntry()).size();
if (size==0) {
return false;
}
@ -343,7 +343,7 @@ public class JSFVascEntrySupportBean implements Serializable {
s.setValue("null");
result.add(s);
for (RowVascAction a:getVascEntry().getVascFrontendData().getVascFrontendHelper().getMultiRowActions(getVascEntry())) {
for (RowVascAction a:getVascEntry().getVascFrontendController().getVascFrontendHelper().getMultiRowActions(getVascEntry())) {
s = new SelectItem();
s.setLabel(i18nMap.get(a.getName()));
s.setDescription(i18nMap.get(a.getDescription()));
@ -390,7 +390,7 @@ public class JSFVascEntrySupportBean implements Serializable {
return;
}
RowVascAction action = vascEntry.getRowActionById(actionId);
VascEntryState state = vascEntry.getVascFrontendData().getVascEntryState();
VascEntryState state = vascEntry.getVascFrontendController().getVascEntryState();
try {
setSelectedMultiRowAction("null"); // reset to selected ... value
@ -427,7 +427,7 @@ public class JSFVascEntrySupportBean implements Serializable {
logger.fine("searchAction");
JSFVascUIComponent comp = JSFVascUIComponent.findVascParent(event.getComponent());
VascEntry entry = comp.getVascEntry();
entry.getVascFrontendData().getVascFrontendActions().searchAction(searchString);
entry.getVascFrontendController().getVascFrontendActions().searchAction(searchString);
}
public void sortAction(ActionEvent event) {
@ -436,18 +436,18 @@ public class JSFVascEntrySupportBean implements Serializable {
JSFVascUIComponent comp = JSFVascUIComponent.findVascParent(event.getComponent());
VascEntry entry = comp.getVascEntry();
VascEntryField field = entry.getVascEntryFieldById(fieldIdString);
entry.getVascFrontendData().getVascFrontendActions().sortAction(field);
sortOrder = entry.getVascFrontendData().getVascEntryState().getVascBackendState().isSortAscending();
entry.getVascFrontendController().getVascFrontendActions().sortAction(field);
sortOrder = entry.getVascFrontendController().getVascEntryState().getVascBackendState().isSortAscending();
sortField = field.getId();
}
public boolean getRenderBackAction() {
return getVascEntry().getVascFrontendData().getVascEntryState().getParent()!=null;
return getVascEntry().getVascFrontendController().getVascEntryState().getParent()!=null;
}
public boolean getRenderBackEditAction() {
if (getVascEntry().getVascFrontendData().getVascEntryState().getParent()!=null) {
if (getVascEntry().getVascFrontendData().getVascEntryState().getParent().getVascEntry().getRowActionById("editRowAction")==null) {
if (getVascEntry().getVascFrontendController().getVascEntryState().getParent()!=null) {
if (getVascEntry().getVascFrontendController().getVascEntryState().getParent().getVascEntry().getRowActionById("editRowAction")==null) {
return false; // parent is not editable
}
return true;
@ -458,11 +458,11 @@ public class JSFVascEntrySupportBean implements Serializable {
public void backAction(ActionEvent event) {
logger.fine("backAction");
JSFVascUIComponent comp = JSFVascUIComponent.findVascParent(event.getComponent());
comp.initGoto(entry.getVascFrontendData().getVascEntryState().getParent());
comp.initGoto(entry.getVascFrontendController().getVascEntryState().getParent());
try {
entry.getVascFrontendData().getVascFrontend().renderView();
entry.getVascFrontendController().getVascFrontend().renderView();
} catch (Exception e) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry, e);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry, e);
}
}
@ -472,8 +472,8 @@ public class JSFVascEntrySupportBean implements Serializable {
VascEntry entry = getVascEntry();
// select record to edit
Object rowObject = entry.getVascFrontendData().getVascEntryState().getParent().getEntryDataObject();
comp.initGoto(entry.getVascFrontendData().getVascEntryState().getParent(),rowObject);
Object rowObject = entry.getVascFrontendController().getVascEntryState().getParent().getEntryDataObject();
comp.initGoto(entry.getVascFrontendController().getVascEntryState().getParent(),rowObject);
}
@ -483,7 +483,7 @@ public class JSFVascEntrySupportBean implements Serializable {
JSFVascUIComponent comp = JSFVascUIComponent.findVascParent(event.getComponent());
VascEntry entry = comp.getVascEntry();
selectedDirectPage=pageIndex+"";
entry.getVascFrontendData().getVascFrontendActions().pageAction(pageIndex);
entry.getVascFrontendController().getVascFrontendActions().pageAction(pageIndex);
}
public void pageNextAction(ActionEvent event) {
@ -491,14 +491,14 @@ public class JSFVascEntrySupportBean implements Serializable {
JSFVascUIComponent comp = JSFVascUIComponent.findVascParent(event.getComponent());
VascEntry entry = comp.getVascEntry();
int pageIndex = entry.getVascFrontendData().getVascEntryState().getVascBackendState().getPageIndex();
int pageIndex = entry.getVascFrontendController().getVascEntryState().getVascBackendState().getPageIndex();
pageIndex++;
selectedDirectPage=pageIndex+"";
entry.getVascFrontendData().getVascFrontendActions().pageAction(pageIndex);
entry.getVascFrontendController().getVascFrontendActions().pageAction(pageIndex);
try {
entry.getVascFrontendData().getVascFrontend().renderView();
entry.getVascFrontendController().getVascFrontend().renderView();
} catch (Exception e) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry, e);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry, e);
}
}
@ -507,23 +507,23 @@ public class JSFVascEntrySupportBean implements Serializable {
JSFVascUIComponent comp = JSFVascUIComponent.findVascParent(event.getComponent());
VascEntry entry = comp.getVascEntry();
int pageIndex = entry.getVascFrontendData().getVascEntryState().getVascBackendState().getPageIndex();
int pageIndex = entry.getVascFrontendController().getVascEntryState().getVascBackendState().getPageIndex();
pageIndex--;
selectedDirectPage=pageIndex+"";
entry.getVascFrontendData().getVascFrontendActions().pageAction(pageIndex);
entry.getVascFrontendController().getVascFrontendActions().pageAction(pageIndex);
try {
entry.getVascFrontendData().getVascFrontend().renderView();
entry.getVascFrontendController().getVascFrontend().renderView();
} catch (Exception e) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry, e);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry, e);
}
}
public boolean getHasPageNextAction() {
return entry.getVascFrontendData().getVascFrontendPager().getHasPageNextAction();
return entry.getVascFrontendController().getVascFrontendPager().getHasPageNextAction();
}
public boolean getHasPagePreviousAction() {
return entry.getVascFrontendData().getVascFrontendPager().getHasPagePreviousAction();
return entry.getVascFrontendController().getVascFrontendPager().getHasPagePreviousAction();
}
@ -547,7 +547,7 @@ public class JSFVascEntrySupportBean implements Serializable {
action.doRowAction(entry, selected.getRecord());
}
} catch (Exception e) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry, e);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry, e);
}
logger.fine("RowAction DONE");
}
@ -561,7 +561,7 @@ public class JSFVascEntrySupportBean implements Serializable {
try {
action.doGlobalAction(entry);
} catch (Exception e) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry, e);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry, e);
}
}
@ -574,7 +574,7 @@ public class JSFVascEntrySupportBean implements Serializable {
try {
action.doRowAction(entry, null);
} catch (Exception e) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry, e);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry, e);
}
}
@ -585,13 +585,13 @@ public class JSFVascEntrySupportBean implements Serializable {
VascDataBackendBean selected = comp.getSupportBean().getSelectedTableRecord();
logger.finer("Set selected: "+selected);
VascEntry entry = comp.getVascEntry();
entry.getVascFrontendData().getVascEntryState().setEntryDataObject(selected.getRecord());
VascLinkEntry l = entry.getVascLinkEntryById(linkId);
entry.getVascFrontendController().getVascEntryState().setEntryDataObject(selected.getRecord());
VascEntryLink l = entry.getVascEntryLinkById(linkId);
comp.initGoto(l);
try {
entry.getVascFrontendData().getVascFrontend().renderView();
entry.getVascFrontendController().getVascFrontend().renderView();
} catch (Exception e) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry, e);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry, e);
}
this.selected=selected; // renderView clears selected !
}
@ -602,10 +602,10 @@ public class JSFVascEntrySupportBean implements Serializable {
JSFVascUIComponent comp = JSFVascUIComponent.findVascParent(event.getComponent());
Object selected = comp.getSupportBean().getSelectedTableRecord().getRecord();
if ("up".equals(moveAction)) {
entry.getVascFrontendData().getVascFrontendActions().moveUpAction(selected);
entry.getVascFrontendController().getVascFrontendActions().moveUpAction(selected);
}
if ("down".equals(moveAction)) {
entry.getVascFrontendData().getVascFrontendActions().moveDownAction(selected);
entry.getVascFrontendController().getVascFrontendActions().moveDownAction(selected);
}
}
@ -616,12 +616,12 @@ public class JSFVascEntrySupportBean implements Serializable {
VascDataBackendBean selected = this.selected;
logger.fine("Set selected: "+selected);
VascEntry entry = comp.getVascEntry();
VascLinkEntry l = entry.getVascLinkEntryById(linkId);
VascEntryLink l = entry.getVascEntryLinkById(linkId);
comp.initGoto(l);
try {
entry.getVascFrontendData().getVascFrontend().renderView();
entry.getVascFrontendController().getVascFrontend().renderView();
} catch (Exception e) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry, e);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry, e);
}
this.selected=selected; // renderView clears selected !
}
@ -630,17 +630,17 @@ public class JSFVascEntrySupportBean implements Serializable {
logger.fine("linkListAction");
String linkId = getComponentType(event.getComponent());
JSFVascUIComponent comp = JSFVascUIComponent.findVascParent(event.getComponent());
VascLinkEntry link = comp.getVascEntry().getVascFrontendData().getVascEntryState().getParent().getVascEntry().getVascLinkEntryById(linkId);
comp.initGoto(link,comp.getVascEntry().getVascFrontendData().getVascEntryState().getParent());
VascEntryLink link = comp.getVascEntry().getVascFrontendController().getVascEntryState().getParent().getVascEntry().getVascEntryLinkById(linkId);
comp.initGoto(link,comp.getVascEntry().getVascFrontendController().getVascEntryState().getParent());
Object o = comp.getVascEntry().getVascFrontendData().getVascEntryState().getParent().getEntryDataObject();
int index = comp.getVascEntry().getVascFrontendData().getVascEntryState().getParent().getEntryDataList().indexOf(o);
Object o = comp.getVascEntry().getVascFrontendController().getVascEntryState().getParent().getEntryDataObject();
int index = comp.getVascEntry().getVascFrontendController().getVascEntryState().getParent().getEntryDataList().indexOf(o);
VascDataBackendBean selected = new VascDataBackendBean(entry,o,index);
this.selected=selected;
try {
entry.getVascFrontendData().getVascFrontend().renderView();
entry.getVascFrontendController().getVascFrontend().renderView();
} catch (Exception e) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry, e);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry, e);
}
this.selected=selected;
}
@ -652,11 +652,11 @@ public class JSFVascEntrySupportBean implements Serializable {
if (getSelected()!=null) {
getSelected().setRealValue(false);
}
entry.getVascFrontendData().getVascEntryState().setEntryDataObject(null);
entry.getVascFrontendController().getVascEntryState().setEntryDataObject(null);
try {
entry.getVascFrontendData().getVascFrontend().renderView();
entry.getVascFrontendController().getVascFrontend().renderView();
} catch (Exception e) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry, e);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry, e);
}
}
@ -679,18 +679,18 @@ public class JSFVascEntrySupportBean implements Serializable {
}
*/
entry.getVascFrontendData().getVascEntryState().setEntryDataObject(selected.getRecord());
entry.getVascFrontendController().getVascEntryState().setEntryDataObject(selected.getRecord());
if (entry.getVascFrontendData().getVascEntryState().isEditCreate()) {
entry.getVascFrontendData().getVascFrontendActions().persistObject();
if (entry.getVascFrontendController().getVascEntryState().isEditCreate()) {
entry.getVascFrontendController().getVascFrontendActions().persistObject();
} else {
entry.getVascFrontendData().getVascFrontendActions().mergeObject();
entry.getVascFrontendController().getVascFrontendActions().mergeObject();
}
try {
entry.getVascFrontendData().getVascFrontend().renderView();
entry.getVascFrontendController().getVascFrontend().renderView();
} catch (Exception e) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry, e);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry, e);
}
}
@ -698,7 +698,7 @@ public class JSFVascEntrySupportBean implements Serializable {
logger.fine("deleteAction");
JSFVascUIComponent comp = JSFVascUIComponent.findVascParent(event.getComponent());
VascEntry entry = comp.getVascEntry();
VascEntryState state = entry.getVascFrontendData().getVascEntryState();
VascEntryState state = entry.getVascFrontendController().getVascEntryState();
List<Object> sels = new ArrayList<Object>(5);
for (Integer rowId:state.getMultiActionSelection().keySet()) {
@ -711,18 +711,18 @@ public class JSFVascEntrySupportBean implements Serializable {
}
if (sels.isEmpty()==false) {
for (Object row:sels) {
entry.getVascFrontendData().getVascEntryState().setEntryDataObject(row);
entry.getVascFrontendData().getVascFrontendActions().deleteObject();
entry.getVascFrontendController().getVascEntryState().setEntryDataObject(row);
entry.getVascFrontendController().getVascFrontendActions().deleteObject();
}
state.getMultiActionSelection().clear(); // after down deselect all options
} else {
entry.getVascFrontendData().getVascFrontendActions().deleteObject();
entry.getVascFrontendController().getVascFrontendActions().deleteObject();
}
try {
entry.getVascFrontendData().getVascFrontend().renderView();
entry.getVascFrontendController().getVascFrontend().renderView();
} catch (Exception e) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry, e);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry, e);
}
}
@ -751,7 +751,7 @@ public class JSFVascEntrySupportBean implements Serializable {
try {
action.doGlobalAction(entry);
} catch (Exception e) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry, e);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry, e);
}
// restore normal view for next request.
@ -777,7 +777,7 @@ public class JSFVascEntrySupportBean implements Serializable {
ex.doExport(out, entry);
out.close();
} catch (Exception e) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry, e);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry, e);
} finally {
fc.responseComplete();
}
@ -807,10 +807,10 @@ public class JSFVascEntrySupportBean implements Serializable {
//selectedDirectPage = "null";
try {
entry.getVascFrontendData().getVascFrontendActions().pageAction(new Integer(id));
entry.getVascFrontendData().getVascFrontend().renderView();
entry.getVascFrontendController().getVascFrontendActions().pageAction(new Integer(id));
entry.getVascFrontendController().getVascFrontend().renderView();
} catch (Exception e) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry, e);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry, e);
}
}
@ -999,7 +999,7 @@ class JSFVascSupportI18nMapController implements Map<String,String> {
}
public String get(Object key) {
String result = entry.getVascFrontendData().getVascEntryResourceResolver().getTextValue((String)key);
String result = entry.getVascFrontendController().getVascEntryResourceResolver().getTextValue((String)key);
return result;
}

12
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascFrontendRenderer.java
View file

@ -30,7 +30,7 @@ import javax.faces.context.FacesContext;
import net.forwardfire.vasc.core.entry.VascEntryExporter;
import net.forwardfire.vasc.frontend.AbstractVascFrontend;
import net.forwardfire.vasc.frontend.VascFrontendData;
import net.forwardfire.vasc.frontend.VascFrontendController;
import net.forwardfire.vasc.frontend.web.jsf.ui.JSFBoolean;
import net.forwardfire.vasc.frontend.web.jsf.ui.JSFLabel;
import net.forwardfire.vasc.frontend.web.jsf.ui.JSFList;
@ -66,7 +66,7 @@ public class JSFVascFrontendRenderer extends AbstractVascFrontend implements Ser
protected void addUiComponents() {
VascFrontendData vfd = getVascEntry().getVascFrontendData();
VascFrontendController vfd = getVascEntry().getVascFrontendController();
// required UI components
vfd.putVascUIComponent(net.forwardfire.vasc.core.ui.VascUIComponent.VASC_LABEL,JSFLabel.class.getName());
@ -100,12 +100,12 @@ public class JSFVascFrontendRenderer extends AbstractVascFrontend implements Ser
UIViewRoot viewRoot = FacesContext.getCurrentInstance().getViewRoot();
JSFVascUIComponent comp = JSFVascUIComponent.findVascChild(viewRoot,getVascEntry().getId());
comp.setRenderFacetState("editView");
entry.getVascFrontendData().getVascFrontendHelper().editReadOnlyUIComponents(entry);
entry.getVascFrontendController().getVascFrontendHelper().editReadOnlyUIComponents(entry);
VascDataBackendBean selBean = null;
if (entry.getVascFrontendData().getVascEntryState().isEditCreate()) {
int index = entry.getVascFrontendData().getVascEntryState().getEntryDataList().size()+1;
selBean = new VascDataBackendBean(entry,entry.getVascFrontendData().getVascEntryState().getEntryDataObject(),index);
if (entry.getVascFrontendController().getVascEntryState().isEditCreate()) {
int index = entry.getVascFrontendController().getVascEntryState().getEntryDataList().size()+1;
selBean = new VascDataBackendBean(entry,entry.getVascFrontendController().getVascEntryState().getEntryDataObject(),index);
} else {
selBean = comp.getSupportBean().getSelectedTableRecord();
}

100
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascUIComponent.java
View file

@ -26,6 +26,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.logging.Logger;
import javax.el.ValueExpression;
@ -36,14 +37,14 @@ import javax.faces.context.FacesContext;
import net.forwardfire.vasc.core.VascController;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.VascEntryField;
import net.forwardfire.vasc.core.VascEntryLocal;
import net.forwardfire.vasc.core.VascEntryState;
import net.forwardfire.vasc.core.VascException;
import net.forwardfire.vasc.core.VascLinkEntry;
import net.forwardfire.vasc.core.VascEntryLink;
import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener;
import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener.VascFrontendEventType;
import net.forwardfire.vasc.frontend.VascFrontendData;
import net.forwardfire.vasc.frontend.VascFrontendController;
import net.forwardfire.vasc.frontend.web.jsf.ui.JSFListModel;
import net.forwardfire.vasc.impl.DefaultVascFactory;
/**
* Renders an JSF vasc entry views.
@ -56,9 +57,6 @@ import net.forwardfire.vasc.impl.DefaultVascFactory;
public class JSFVascUIComponent extends UIComponentBase {
public static final String FAMILY = "vasc.jsf.component.family";
public static final String VASC_CONTROLLER_KEY = "vascController";
public static final String VASC_FRONTEND_DATA_KEY = "vascFrontendData";
public static final String ENTRY_NAME_KEY = "entryName";
public static final String ENTRY_SUPPORT_VAR_KEY = "entrySupportVar";
public static final String TABLE_RECORD_VAR_KEY = "tableRecordVar";
public static final String INJECT_EDIT_FIELDS_ID = "injectEditFieldsId";
@ -70,7 +68,7 @@ public class JSFVascUIComponent extends UIComponentBase {
private JSFVascFrontendRenderer renderer = null;
private JSFVascEntrySupportBean supportBean = null;
private String renderFacetState = null;
private VascLinkEntry link = null;
private VascEntryLink link = null;
private VascEntryState linkState = null;
private VascEntryState state = null;
private Object stateEditId = null;
@ -89,15 +87,12 @@ public class JSFVascUIComponent extends UIComponentBase {
@Override
public Object saveState(FacesContext facesContext) {
logger.fine("Save State");
Object values[] = new Object[8];
Object values[] = new Object[5];
values[0] = super.saveState(facesContext);
values[1] = this.getAttributes().get(VASC_CONTROLLER_KEY);
values[2] = this.getAttributes().get(VASC_FRONTEND_DATA_KEY);
values[3] = this.getAttributes().get(ENTRY_NAME_KEY);
values[4] = renderer;
values[5] = supportBean;
values[6] = renderFacetState;
values[7] = this.getAttributes().get(INJECT_TABLE_OPTIONS_ON_CHANGE);
values[1] = renderer;
values[2] = supportBean;
values[3] = renderFacetState;
values[4] = this.getAttributes().get(INJECT_TABLE_OPTIONS_ON_CHANGE);
return values;
}
@ -107,13 +102,10 @@ public class JSFVascUIComponent extends UIComponentBase {
logger.fine("Resotre State");
Object values[] = (Object[])state;
super.restoreState(facesContext, values[0]);
this.getAttributes().put(VASC_CONTROLLER_KEY, values[1]);
this.getAttributes().put(VASC_FRONTEND_DATA_KEY, values[2]);
this.getAttributes().put(ENTRY_NAME_KEY, values[3]);
renderer = (JSFVascFrontendRenderer) values[4];
supportBean = (JSFVascEntrySupportBean) values[5];
renderFacetState = (String) values[6];
injectTableOptionOnChange = (String) values[7];
renderer = (JSFVascFrontendRenderer) values[1];
supportBean = (JSFVascEntrySupportBean) values[2];
renderFacetState = (String) values[3];
injectTableOptionOnChange = (String) values[4];
// TODO: check if we can move this some day...
String entrySupportVar = (String)getAttributes().get(JSFVascUIComponent.ENTRY_SUPPORT_VAR_KEY);
@ -175,11 +167,11 @@ public class JSFVascUIComponent extends UIComponentBase {
return renderer.getVascEntry();
}
protected void initGoto(VascLinkEntry link) {
protected void initGoto(VascEntryLink link) {
logger.fine("init goto "+link);
this.link=link;
}
protected void initGoto(VascLinkEntry link,VascEntryState state) {
protected void initGoto(VascEntryLink link,VascEntryState state) {
logger.fine("init goto link: "+link);
this.link=link;
this.linkState=state;
@ -220,7 +212,7 @@ public class JSFVascUIComponent extends UIComponentBase {
}
supportBean = new JSFVascEntrySupportBean(entry);
// copy search string for preadded search string from application layer
supportBean.setSearchString(entry.getVascFrontendData().getVascEntryState().getVascBackendState().getSearchString());
supportBean.setSearchString(entry.getVascFrontendController().getVascEntryState().getVascBackendState().getSearchString());
init = true;
}
@ -237,10 +229,10 @@ public class JSFVascUIComponent extends UIComponentBase {
// edit action copyed
try {
VascEntry entry = supportBean.getVascEntry();
entry.getVascFrontendData().getVascEntryState().setEditCreate(false);
entry.getVascFrontendData().fireVascFrontendEvent(entry, VascFrontendEventType.SELECT, rowObject);
entry.getVascFrontendData().getVascEntryState().setEntryDataObject(rowObject);
entry.getVascFrontendData().getVascFrontend().renderEdit();
entry.getVascFrontendController().getVascEntryState().setEditCreate(false);
entry.getVascFrontendController().fireVascFrontendEvent(entry, VascFrontendEventType.SELECT, rowObject);
entry.getVascFrontendController().getVascEntryState().setEntryDataObject(rowObject);
entry.getVascFrontendController().getVascFrontend().renderEdit();
} catch (Exception e) {
throw new RuntimeException("Could not renderEdit: "+e.getMessage(),e);
}
@ -306,44 +298,34 @@ public class JSFVascUIComponent extends UIComponentBase {
public VascEntry createClonedVascEntry() {
String entryName = null;
VascController vascController = null;
VascFrontendData frontendData = null;
if (getAttributes().get(VASC_CONTROLLER_KEY) instanceof String) {
// fix for JSP tag handler
logger.finer("Getting expression: "+getAttributes().get(VASC_CONTROLLER_KEY));
ValueExpression ve1 = FacesContext.getCurrentInstance().getApplication().getExpressionFactory().createValueExpression(FacesContext.getCurrentInstance().getELContext(), (String)getAttributes().get(VASC_CONTROLLER_KEY), Object.class);
ValueExpression ve2 = FacesContext.getCurrentInstance().getApplication().getExpressionFactory().createValueExpression(FacesContext.getCurrentInstance().getELContext(), (String)getAttributes().get(VASC_FRONTEND_DATA_KEY), Object.class);
ValueExpression ve3 = FacesContext.getCurrentInstance().getApplication().getExpressionFactory().createValueExpression(FacesContext.getCurrentInstance().getELContext(), (String)getAttributes().get(ENTRY_NAME_KEY), String.class);
vascController = (VascController)ve1.getValue( FacesContext.getCurrentInstance().getELContext());
frontendData = (VascFrontendData)ve2.getValue( FacesContext.getCurrentInstance().getELContext());
entryName = (String)ve3.getValue( FacesContext.getCurrentInstance().getELContext());
} else {
vascController = (VascController)getAttributes().get(VASC_CONTROLLER_KEY);
frontendData = (VascFrontendData)getAttributes().get(VASC_FRONTEND_DATA_KEY);
entryName = (String)getAttributes().get(ENTRY_NAME_KEY);
}
VascController vascController = (VascController)FacesContext.getCurrentInstance().getExternalContext().getRequestMap().get(VascRequestFacesFilter.REQ_VASC_CONTOLLER);
String entryId = (String)FacesContext.getCurrentInstance().getExternalContext().getRequestMap().get(VascRequestFacesFilter.REQ_VASC_ENTRY_ID);
if (link!=null) {
entryName = link.getVascEntryId();
entryId = link.getVascEntryId();
}
if (state!=null) {
entryName = state.getVascEntry().getId();
entryId = state.getVascEntry().getId();
}
VascEntry entry = vascController.getVascEntryController().getVascEntryById(entryName);
VascEntryLocal entry = (VascEntryLocal)vascController.getVascEntryController().getVascEntryById(entryId);
if (entry==null) {
throw new NullPointerException("Could not locate '"+entryName+"' from : "+vascController);
throw new NullPointerException("Could not get '"+entryId+"' from : "+vascController);
}
frontendData.setVascFrontend(null); // reset data obj. todo rm this.
try {
DefaultVascFactory.fillVascEntryFrontend(entry, vascController, frontendData);
frontendData.initFrontendListeners(entry,"jsf");
vascController.getVascEntryConfigController().configVascFrontendController(vascController, entry);
} catch (Exception e1) {
throw new RuntimeException(e1);
}
VascFrontendController frontendData = entry.getVascFrontendController();
try {
frontendData.initFrontendListeners(entry,"jsf");
} catch (Exception e1) {
e1.printStackTrace();
}
if (state!=null) {
// copy prevois parent
@ -353,7 +335,7 @@ public class JSFVascUIComponent extends UIComponentBase {
if (link!=null) {
// save state
if (linkState==null) {
frontendData.getVascEntryState().setParent(getVascEntry().getVascFrontendData().getVascEntryState());
frontendData.getVascEntryState().setParent(getVascEntry().getVascFrontendController().getVascEntryState());
} else {
frontendData.getVascEntryState().setParent(linkState);
}
@ -375,7 +357,7 @@ public class JSFVascUIComponent extends UIComponentBase {
Object selectedValue = v.getVascEntryFieldValue().getValue(v, selected);
// set data parameter on new vasc entry
entry.getVascFrontendData().getVascEntryState().getVascBackendState().setDataParameter(parameterName, selectedValue);
entry.getVascFrontendController().getVascEntryState().getVascBackendState().setDataParameter(parameterName, selectedValue);
logger.fine("Setting link parameter: "+parameterName+" with: "+selectedValue);
}
@ -388,7 +370,7 @@ public class JSFVascUIComponent extends UIComponentBase {
}
// create listener for new objects
entry.getVascFrontendData().addVascEntryFrontendEventListener(new CreateEntryFieldValuesListener2(fieldId,selectedValue));
entry.getVascFrontendController().addVascEntryFrontendEventListener(new CreateEntryFieldValuesListener2(fieldId,selectedValue));
}
} catch (Exception e) {
throw new RuntimeException("error: "+e.getMessage(),e);
@ -397,7 +379,7 @@ public class JSFVascUIComponent extends UIComponentBase {
String entrySupportVar = (String)getAttributes().get(JSFVascUIComponent.ENTRY_SUPPORT_VAR_KEY);
entry.getVascFrontendData().addVascEntryFrontendEventListener(new JSFVascEntryEventListener(entrySupportVar));
entry.getVascFrontendController().addVascEntryFrontendEventListener(new JSFVascEntryEventListener(entrySupportVar));
return entry;
}
@ -422,7 +404,7 @@ public class JSFVascUIComponent extends UIComponentBase {
try {
field.getVascEntryFieldValue().setValue(field, data, value);
} catch (VascException e) {
entry.getVascFrontendData().getVascFrontendHelper().handleException(entry, e);
entry.getVascFrontendController().getVascFrontendHelper().handleException(entry, e);
}
}
}

33
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascUIComponentRenderer.java
View file

@ -63,9 +63,10 @@ import javax.faces.validator.ValidatorException;
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.VascLinkEntry;
import net.forwardfire.vasc.core.VascLinkEntryType;
import net.forwardfire.vasc.core.VascEntryLink;
import net.forwardfire.vasc.core.VascEntryLinkType;
import net.forwardfire.vasc.core.actions.RowVascAction;
import net.forwardfire.vasc.core.ui.VascOptionValueModelListener;
import net.forwardfire.vasc.core.ui.VascUIComponent;
@ -106,7 +107,7 @@ public class JSFVascUIComponentRenderer extends Renderer {
// hack for edit back action to set field disabled
VascEntry entry = comp.getVascEntry();
entry.getVascFrontendData().getVascFrontendHelper().editReadOnlyUIComponents(entry);
entry.getVascFrontendController().getVascFrontendHelper().editReadOnlyUIComponents(entry);
}
// render the current facet of the vasc component
@ -160,7 +161,7 @@ public class JSFVascUIComponentRenderer extends Renderer {
}
private String i18n(VascEntry entry,String key,Object...params) {
return entry.getVascFrontendData().getVascEntryResourceResolver().getTextValue(key,params);
return entry.getVascFrontendController().getVascEntryResourceResolver().getTextValue(key,params);
}
@ -177,7 +178,7 @@ public class JSFVascUIComponentRenderer extends Renderer {
String entrySupportVar = (String)comp.getAttributes().get(JSFVascUIComponent.ENTRY_SUPPORT_VAR_KEY);
for (VascEntryField c:entry.getVascEntryFields()) {
if (entry.getVascFrontendData().getVascFrontendHelper().renderEdit(c)==false) {
if (entry.getVascFrontendController().getVascFrontendDataSelector().isFieldEdit(c)==false) {
continue;
}
for (int i=0;i<c.getVascEntryFieldType().getUIComponentCount(c);i++) {
@ -217,7 +218,7 @@ public class JSFVascUIComponentRenderer extends Renderer {
//column++;
// i==0 is for multi field editor support... which is still very in progress
if (i==0) {
entry.getVascFrontendData().addFieldVascUIComponents(c, editor,jsfEdit);
entry.getVascFrontendController().addFieldVascUIComponents(c, editor,jsfEdit);
}
}
}
@ -252,7 +253,7 @@ public class JSFVascUIComponentRenderer extends Renderer {
ValueExpression ve7 = FacesContext.getCurrentInstance().getApplication().getExpressionFactory().createValueExpression(FacesContext.getCurrentInstance().getELContext(), "#{"+entrySupportVar+".selected.field"+index+"}", Object.class);
ve7.setValue(FacesContext.getCurrentInstance().getELContext(), object);
List<String> errors = entry.getVascFrontendData().getVascFrontendHelper().validateObjectField(field);
List<String> errors = entry.getVascFrontendController().getVascFrontendHelper().validateObjectField(field);
logger.fine("Validate: "+component+" errors: "+errors.size()+" value: "+object);
if (errors.isEmpty()) {
return; // no errors
@ -283,7 +284,7 @@ public class JSFVascUIComponentRenderer extends Renderer {
//JSFVascUIComponent comp = JSFVascUIComponent.findVascParent(grid);
VascEntry entry = comp.getVascEntry();
for (VascEntryField option:entry.getListOptions()) {
for (VascEntryListOption option:entry.getVascEntryListOptions()) {
for (int i=0;i<option.getVascEntryFieldType().getUIComponentCount(option);i++) {
VascUIComponent label = option.getVascEntryFieldType().provideLabelUIComponent(i,option);
@ -342,11 +343,11 @@ public class JSFVascUIComponentRenderer extends Renderer {
}
// i==0 is for multi field editor support... which is stell very in progress aka not working
if (i==0) {
entry.getVascFrontendData().addFieldVascUIComponents(option, editor,jsfEdit);
entry.getVascFrontendController().addFieldVascUIComponents(option, editor,jsfEdit);
}
}
}
entry.getVascFrontendData().getVascFrontendHelper().headerOptionsCreatedFillData(entry);
entry.getVascFrontendController().getVascFrontendHelper().headerOptionsCreatedFillData(entry);
}
public class ModelChangeListener implements ValueChangeListener,Serializable {
private static final long serialVersionUID = 1L;
@ -372,7 +373,7 @@ public class JSFVascUIComponentRenderer extends Renderer {
String entrySupportVar = (String)comp.getAttributes().get(JSFVascUIComponent.ENTRY_SUPPORT_VAR_KEY);
String tableRecordVar = (String)comp.getAttributes().get(JSFVascUIComponent.TABLE_RECORD_VAR_KEY);
if (!entry.getVascFrontendData().getVascFrontendHelper().getMultiRowActions(entry).isEmpty()) {
if (!entry.getVascFrontendController().getVascFrontendHelper().getMultiRowActions(entry).isEmpty()) {
UIColumn colUp = (UIColumn)application.createComponent(UIColumn.COMPONENT_TYPE);
colUp.setId(viewRoot.createUniqueId());
@ -397,7 +398,7 @@ public class JSFVascUIComponentRenderer extends Renderer {
HtmlSelectBooleanCheckbox select = (HtmlSelectBooleanCheckbox)application.createComponent(HtmlSelectBooleanCheckbox.COMPONENT_TYPE);
select.setId(viewRoot.createUniqueId());
select.setStyleClass("js_table_select_all");
ValueExpression ve1 = application.getExpressionFactory().createValueExpression(FacesContext.getCurrentInstance().getELContext(),"#{"+entrySupportVar+".vascEntry.vascFrontendData.vascEntryState.multiActionSelection["+tableRecordVar+".recordId]}",Object.class);
ValueExpression ve1 = application.getExpressionFactory().createValueExpression(FacesContext.getCurrentInstance().getELContext(),"#{"+entrySupportVar+".vascEntry.vascFrontendController.vascEntryState.multiActionSelection["+tableRecordVar+".recordId]}",Object.class);
select.setValueExpression("value", ve1);
colUp.getChildren().add(select);
@ -406,7 +407,7 @@ public class JSFVascUIComponentRenderer extends Renderer {
for (VascEntryField c:entry.getVascEntryFields()) {
if (entry.getVascFrontendData().getVascFrontendHelper().renderList(c)==false) {
if (entry.getVascFrontendController().getVascFrontendDataSelector().isFieldList(c)==false) {
continue;
}
UIColumn col = (UIColumn)application.createComponent(UIColumn.COMPONENT_TYPE);
@ -454,7 +455,7 @@ public class JSFVascUIComponentRenderer extends Renderer {
table.getChildren().add(col);
}
if (entry.getVascFrontendData().getVascEntryState().getVascBackend().isRecordMoveable()) {
if (entry.getVascFrontendController().getVascEntryState().getVascBackend().isRecordMoveable()) {
UIColumn colUp = (UIColumn)application.createComponent(UIColumn.COMPONENT_TYPE);
colUp.setId(viewRoot.createUniqueId());
@ -493,7 +494,7 @@ public class JSFVascUIComponentRenderer extends Renderer {
table.getChildren().add(colDown);
}
for (VascLinkEntry vascLink:entry.getVascFrontendData().getVascFrontendHelper().getVascLinkEntryByType(entry, VascLinkEntryType.LIST)) {
for (VascEntryLink vascLink:entry.getVascFrontendController().getVascFrontendHelper().getVascLinkEntryByType(entry, VascEntryLinkType.LIST)) {
UIColumn col = (UIColumn)application.createComponent(UIColumn.COMPONENT_TYPE);
col.setId(viewRoot.createUniqueId());
@ -520,7 +521,7 @@ public class JSFVascUIComponentRenderer extends Renderer {
}
for (RowVascAction action:entry.getRowActions()) {
if (entry.getVascFrontendData().getVascFrontendHelper().renderRowVascAction(action)==false) {
if (entry.getVascFrontendController().getVascFrontendDataSelector().isActionAllowed(action)==false) {
continue;
}
if (AddRowAction.ACTION_ID.equals(action.getId())) {

52
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascUIComponentTag.java
View file

@ -38,9 +38,6 @@ public class JSFVascUIComponentTag extends UIComponentELTag {
public static final String COMPONENT_TYPE = "vasc.jsf.component";
public static final String RENDERER_TYPE = "vasc.jsf.component.renderer";
private ValueExpression vascController = null;
private ValueExpression vascFrontendData = null;
private ValueExpression entryName = null;
private ValueExpression entrySupportVar = null;
private ValueExpression tableRecordVar = null;
private ValueExpression injectEditFieldsId = null;
@ -64,9 +61,7 @@ public class JSFVascUIComponentTag extends UIComponentELTag {
@Override
protected void setProperties(UIComponent component) {
super.setProperties(component);
processProperty(component, vascController, JSFVascUIComponent.VASC_CONTROLLER_KEY);
processProperty(component, vascFrontendData, JSFVascUIComponent.VASC_FRONTEND_DATA_KEY);
processProperty(component, entryName, JSFVascUIComponent.ENTRY_NAME_KEY);
//processProperty(component, entryName, JSFVascUIComponent.ENTRY_NAME_KEY);
processProperty(component, entrySupportVar, JSFVascUIComponent.ENTRY_SUPPORT_VAR_KEY);
processProperty(component, tableRecordVar, JSFVascUIComponent.TABLE_RECORD_VAR_KEY);
processProperty(component, injectEditFieldsId, JSFVascUIComponent.INJECT_EDIT_FIELDS_ID);
@ -77,9 +72,6 @@ public class JSFVascUIComponentTag extends UIComponentELTag {
public void release() {
super.release();
vascController = null;
vascFrontendData = null;
entryName = null;
entrySupportVar = null;
tableRecordVar = null;
injectEditFieldsId = null;
@ -100,48 +92,6 @@ public class JSFVascUIComponentTag extends UIComponentELTag {
// ============= BEAN FIELDS
/**
* @return the vascController
*/
public ValueExpression getVascController() {
return vascController;
}
/**
* @param vascController the vascController to set
*/
public void setVascController(ValueExpression vascController) {
this.vascController = vascController;
}
/**
* @return the entryName
*/
public ValueExpression getEntryName() {
return entryName;
}
/**
* @param entryName the entryName to set
*/
public void setEntryName(ValueExpression entryName) {
this.entryName = entryName;
}
/**
* @return the vascFrontendData
*/
public ValueExpression getVascFrontendData() {
return vascFrontendData;
}
/**
* @param vascFrontendData the vascFrontendData to set
*/
public void setVascFrontendData(ValueExpression vascFrontendData) {
this.vascFrontendData = vascFrontendData;
}
/**
* @return the entrySupportVar
*/

2
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascValidatePhaseListener.java
View file

@ -86,7 +86,7 @@ public class JSFVascValidatePhaseListener implements PhaseListener {
return; // no editing
}
VascEntry entry = comp.getVascEntry();
if (entry.getVascFrontendData().getVascEntryState().getEntryDataObject()==null) {
if (entry.getVascFrontendController().getVascEntryState().getEntryDataObject()==null) {
return; // we are not in edit mode.
}
UIInput in = (UIInput)component;

2
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/VascDataBackendBean.java
View file

@ -63,7 +63,7 @@ public class VascDataBackendBean implements Serializable {
if (index>entry.getVascEntryFields().size()) {
throw new IllegalArgumentException("Index is bigger then total field size: "+index);
}
return entry.getVascEntryFields().get(index);
return entry.getVascFrontendController().getVascFrontendDataSelector().getFieldsList().get(index);
}
static public int getIndexId(VascEntryField field) {

91
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/VascRequestFacesFilter.java
View file

@ -23,8 +23,6 @@
package net.forwardfire.vasc.frontend.web.jsf;
import java.io.IOException;
import java.util.Locale;
import java.util.ResourceBundle;
import java.util.logging.Level;
import java.util.logging.Logger;
@ -45,6 +43,10 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import net.forwardfire.vasc.core.VascController;
import net.forwardfire.vasc.core.VascControllerProvider;
import net.forwardfire.vasc.core.VascEntry;
/**
* Parses the Request info path info 3 vasc attributes an dispatches the request to the templateFile.
*
@ -56,7 +58,11 @@ public class VascRequestFacesFilter implements Filter {
private Logger logger = null;
private String templateFile = null;
private ServletContext servletContext = null;
private String resourceBundle = null;
private VascController vascController = null;
private VascControllerProvider vascControllerProvider = null;
static public final String REQ_VASC_CONTOLLER = "requestScopeVascController";
static public final String REQ_VASC_ENTRY_ID = "requestScopeVascEntryId";
static public final String REQ_VASC_URI_PATH = "requestScopeVascUriPath";
/**
* @see javax.servlet.Filter#destroy()
@ -77,11 +83,30 @@ public class VascRequestFacesFilter implements Filter {
if (templateFile==null) {
throw new ServletException("No templateFile init-param found.");
}
resourceBundle=config.getInitParameter("resourceBundle");
if (resourceBundle==null) {
return; //throw new ServletException("No resourceBundle init-param found.");
String className = config.getInitParameter("vascControllerProvider");
if (className==null) {
throw new ServletException("Can't start with null vascControllerProvider init parameter.");
}
String classArgument = null;
int atIndex = className.indexOf('@');
if (atIndex > 0) {
classArgument = className.substring(0,atIndex);
className = className.substring(atIndex+1);
}
try {
ClassLoader cl = Thread.currentThread().getContextClassLoader();
if (cl == null) {
cl = className.getClass().getClassLoader();
}
Class<?> clazz = cl.loadClass(className);
if (classArgument==null) {
vascControllerProvider = (VascControllerProvider)clazz.newInstance();
} else {
vascControllerProvider = (VascControllerProvider)clazz.getConstructor(String.class).newInstance(classArgument);
}
} catch (Exception e) {
throw new ServletException("Could not create VascControllerProvider: "+e.getMessage(),e);
}
ResourceBundle.getBundle(resourceBundle); // test if it loads
}
@ -101,7 +126,7 @@ public class VascRequestFacesFilter implements Filter {
}
// stuff to fill
String entityName = null;
String entryId = null;
String actionName = null;
String actionRecordId = null;
@ -111,9 +136,9 @@ public class VascRequestFacesFilter implements Filter {
String actionString = null;
if (index>0) {
actionString = path.substring(index+1);
entityName = path.substring(0,index);
entryId = path.substring(0,index);
} else {
entityName = path;
entryId = path;
}
if (actionString!=null) {
@ -132,7 +157,7 @@ public class VascRequestFacesFilter implements Filter {
//log
if (logger.isLoggable(Level.FINE)) {
logger.log(Level.FINE,"entityName="+entityName+" actionName="+actionName+" actionRecordId="+actionRecordId);
logger.log(Level.FINE,"entryId="+entryId+" actionName="+actionName+" actionRecordId="+actionRecordId);
}
// Acquire the FacesContext instance for this request
@ -145,42 +170,34 @@ public class VascRequestFacesFilter implements Filter {
facesContext = facesContextFactory.getFacesContext(servletContext, request, response, lifecycle);
ProtectedFacesContext.setFacesContextAsCurrentInstance(facesContext);
UIViewRoot viewRoot = facesContext.getApplication().getViewHandler().createView(facesContext,entityName+actionName);
UIViewRoot viewRoot = facesContext.getApplication().getViewHandler().createView(facesContext,entryId+actionName);
facesContext.setViewRoot(viewRoot);
}
// add to response
request.setAttribute("requestScopeVascEntityName", entityName);
request.setAttribute("requestScopeVascActionName", actionName);
request.setAttribute("requestScopeVascRecordId" , actionRecordId);
request.setAttribute("requestScopeVascPath" , request.getRequestURI());
// Set page title
Locale locale = facesContext.getViewRoot().getLocale();
if (locale==null) {
logger.info("Failling back to defualt.");
locale = new Locale("nl");
}
try {
if (resourceBundle!=null) {
ResourceBundle i18n = ResourceBundle.getBundle(resourceBundle,locale);
String titleI18n = i18n.getString("vasc.entry."+entityName+".name");
request.setAttribute("requestScopeVascEntityNameI18n" ,titleI18n);
} else {
request.setAttribute("requestScopeVascEntityNameI18n" ,entityName);
if (vascController==null) {
synchronized (this) {
vascController = vascControllerProvider.getVascController();
}
} catch (Exception e) {
e.printStackTrace();
request.setAttribute("requestScopeVascEntityNameI18n" ,entityName);
}
// Fetch entry and do checks
VascEntry vascEntry = vascController.getVascEntryController().getVascEntryById(entryId);
if (vascEntry == null) {
response.sendRedirect("/");
return;
}
// add to request attributes
request.setAttribute(REQ_VASC_CONTOLLER, vascController);
request.setAttribute(REQ_VASC_ENTRY_ID, vascEntry.getId());
request.setAttribute(REQ_VASC_URI_PATH, request.getRequestURI());
// And dispatch to the vasc template file.
try {
request.getRequestDispatcher(templateFile).forward(request, response);
} catch (ViewExpiredException e) {
// lets try again
response.sendRedirect(request.getRequestURL().toString());
response.sendRedirect(request.getRequestURL().toString()); // lets try again
}
// done
}
private abstract static class ProtectedFacesContext extends FacesContext {

5
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/VascViewHandler.java
View file

@ -52,12 +52,11 @@ public class VascViewHandler extends ViewHandler {
*/
@Override
public String getActionURL(FacesContext context, String name) {
HttpServletRequest request = (HttpServletRequest)context.getExternalContext().getRequest();
if (request.getAttribute("requestScopeVascPath")==null) {
if (request.getAttribute(VascRequestFacesFilter.REQ_VASC_URI_PATH)==null) {
return parentViewHandler.getActionURL(context, name);
}
String path = (String)request.getAttribute("requestScopeVascPath");
String path = (String)request.getAttribute(VascRequestFacesFilter.REQ_VASC_URI_PATH);
return path;
}