ff-attic/imxmi
2
0
Fork 0
Code Activity

Clean demo directory layout

Browse source
This commit is contained in:
Willem Cazander 2012-05-13 17:25:50 +02:00
parent b3923bd2fb
commit 7c044adb1f
61 changed files with 2334 additions and 252 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -55,11 +55,11 @@ public class VascCXFServlet extends CXFNonSpringServlet {
@Override
public void init(ServletConfig sc) throws ServletException {
String className = getInitParameter("vascControllerProvider");
String className = sc.getInitParameter("vascControllerProvider");
if (className==null) {
throw new ServletException("Can't start with null vascControllerProvider init parameter.");
}
String exportTreeStr = getInitParameter("exportTree");
String exportTreeStr = sc.getInitParameter("exportTree");
if (exportTreeStr!=null && "true".equalsIgnoreCase(exportTreeStr)) {
exportTree = true;
}

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

@ -25,7 +25,6 @@ package net.forwardfire.vasc.frontend.swing;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@ -197,12 +196,14 @@ public class SwingVascEditDialog extends JPanel {
//if(entry.getVascFrontendData().getVascFrontendHelper().validateObject(entry, bean)) {
// return;
//}
result = bean;
entry.getVascFrontendData().getVascEntryState().setEntryDataObject(result);
entry.getVascFrontendData().getVascFrontendActions().mergeObject();
if (entry.getVascFrontendData().getVascEntryState().isEditCreate()) {
entry.getVascFrontendData().getVascFrontendActions().persistObject();
} else {
entry.getVascFrontendData().getVascFrontendActions().mergeObject();
}
panels.closeVascView(editView, SwingVascEditDialog.this.entry);
//setVisible(false);

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

@ -167,9 +167,11 @@ public class SwingVascFrontend extends AbstractVascFrontend {
beanValue=beanValue.substring(0, 30);
}
}
JPanel editPanel = panels.initVascView();
SwingVascEditDialog dialog = new SwingVascEditDialog(this,editPanel,entry,rowBean,beanValue,panels);
entry.getVascFrontendData().getVascFrontendHelper().editReadOnlyUIComponents(entry);
panels.openVascView(editPanel,entry);
}

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

@ -175,7 +175,12 @@ abstract public class AbstractJSFVascFacesControllerEJB extends AbstractJSFVascF
this.backendId=backendId;
this.vascManager=vascManager;
}
public void startBackend() {
}
public void stopBackend() {
}
public void delete(Object object) throws VascException {
Object[] args = new Object[1];
args[0]=object;

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

@ -680,7 +680,12 @@ public class JSFVascEntrySupportBean implements Serializable {
*/
entry.getVascFrontendData().getVascEntryState().setEntryDataObject(selected.getRecord());
entry.getVascFrontendData().getVascFrontendActions().mergeObject();
if (entry.getVascFrontendData().getVascEntryState().isEditCreate()) {
entry.getVascFrontendData().getVascFrontendActions().persistObject();
} else {
entry.getVascFrontendData().getVascFrontendActions().mergeObject();
}
try {
entry.getVascFrontendData().getVascFrontend().renderView();