ff-attic/imxmi
2
0
Fork 0
Code Activity

Refactored demo section to single app layout.

Browse source
This commit is contained in:
Willem Cazander 2013-09-20 19:18:39 +02:00
parent b3635cf64d
commit 4bd244f4e5
337 changed files with 1630 additions and 1883 deletions
Download patch file Download diff file Expand all files Collapse all files

2
vasc-frontend/pom.xml
View file

@ -3,7 +3,7 @@
<parent>
<artifactId>vasc</artifactId>
<groupId>net.forwardfire.vasc</groupId>
<version>0.4.1-SNAPSHOT</version>
<version>0.4.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>vasc-frontend</artifactId>

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

@ -3,7 +3,7 @@
<parent>
<artifactId>vasc-frontend</artifactId>
<groupId>net.forwardfire.vasc</groupId>
<version>0.4.1-SNAPSHOT</version>
<version>0.4.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>vasc-frontend-cxf</artifactId>

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

@ -3,7 +3,7 @@
<parent>
<artifactId>vasc-frontend-cxf</artifactId>
<groupId>net.forwardfire.vasc</groupId>
<version>0.4.1-SNAPSHOT</version>
<version>0.4.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>vasc-frontend-cxf-client</artifactId>

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

@ -3,7 +3,7 @@
<parent>
<artifactId>vasc-frontend-cxf</artifactId>
<groupId>net.forwardfire.vasc</groupId>
<version>0.4.1-SNAPSHOT</version>
<version>0.4.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>vasc-frontend-cxf-server</artifactId>

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

@ -3,7 +3,7 @@
<parent>
<artifactId>vasc-frontend</artifactId>
<groupId>net.forwardfire.vasc</groupId>
<version>0.4.1-SNAPSHOT</version>
<version>0.4.2-SNAPSHOT</version>
</parent>
<artifactId>vasc-frontend-swing</artifactId>
<name>vasc-frontend-swing</name>
@ -27,7 +27,7 @@
</dependency>
<dependency>
<groupId>net.forwardfire.vasc.test</groupId>
<artifactId>vasc-test-frontend-data</artifactId>
<artifactId>vasc-test-frontend</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

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

@ -30,7 +30,6 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;

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

@ -3,7 +3,7 @@
<parent>
<artifactId>vasc-frontend</artifactId>
<groupId>net.forwardfire.vasc</groupId>
<version>0.4.1-SNAPSHOT</version>
<version>0.4.2-SNAPSHOT</version>
</parent>
<artifactId>vasc-frontend-swt</artifactId>
<name>vasc-frontend-swt</name>
@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>net.forwardfire.vasc.test</groupId>
<artifactId>vasc-test-frontend-data</artifactId>
<artifactId>vasc-test-frontend</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

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

@ -22,7 +22,6 @@
package net.forwardfire.vasc.frontend.swt;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
@ -472,6 +471,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
};
entry.getVascFrontendController().addVascEntryFrontendEventListener(new VascEntryFrontendEventListener() {
private static final long serialVersionUID = -5558286028449368490L;
public VascFrontendEventType[] getEventTypes() {
VascFrontendEventType[] result = {VascEntryFrontendEventListener.VascFrontendEventType.POST_READ};
return result;
@ -527,12 +527,12 @@ public class SwtVascFrontend extends AbstractVascFrontend {
public void controlResized(ControlEvent e) {
Rectangle area = comp.getClientArea();
Point preferredSize = table.computeSize(SWT.DEFAULT, SWT.DEFAULT);
int width = area.width - 2*table.getBorderWidth();
// int width = area.width - 2*table.getBorderWidth();
if (preferredSize.y > area.height + table.getHeaderHeight()) {
// Subtract the scrollbar width from the total column width
// if a vertical scrollbar will be required
Point vBarSize = table.getVerticalBar().getSize();
width -= vBarSize.x;
// Point vBarSize = table.getVerticalBar().getSize();
// width -= vBarSize.x;
}
Point oldSize = table.getSize();
if (oldSize.x > area.width) {

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

@ -3,7 +3,7 @@
<parent>
<artifactId>vasc-frontend</artifactId>
<groupId>net.forwardfire.vasc</groupId>
<version>0.4.1-SNAPSHOT</version>
<version>0.4.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>vasc-frontend-web-export</artifactId>

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

@ -3,7 +3,7 @@
<parent>
<artifactId>vasc-frontend</artifactId>
<groupId>net.forwardfire.vasc</groupId>
<version>0.4.1-SNAPSHOT</version>
<version>0.4.2-SNAPSHOT</version>
</parent>
<artifactId>vasc-frontend-web-jsf</artifactId>
<name>vasc-frontend-web-jsf</name>

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

@ -33,6 +33,8 @@ import java.util.ResourceBundle;
import javax.xml.parsers.ParserConfigurationException;
import org.x4o.xml.io.X4OConnectionException;
import org.x4o.xml.io.X4OReader;
import org.xml.sax.SAXException;
import net.forwardfire.vasc.core.VascController;
@ -40,7 +42,7 @@ import net.forwardfire.vasc.core.VascEntryControllerLocal;
import net.forwardfire.vasc.core.VascException;
import net.forwardfire.vasc.frontend.VascFrontendException;
import net.forwardfire.vasc.impl.DefaultVascFactory;
import net.forwardfire.vasc.impl.x4o.VascParser;
import net.forwardfire.vasc.impl.x4o.VascDriver;
@ -140,12 +142,14 @@ abstract public class AbstractJSFVascFacesControllerLocal extends AbstractJSFVas
// Load vasc resources
for (String res:getVascParseResources()) {
VascParser vp = new VascParser(c);
VascDriver driver = VascDriver.getInstance();
X4OReader<VascController> reader = driver.createReader();
driver.addVascController(reader, c);
for (String name:vascGlobalELBeans.keySet()) {
Object value = vascGlobalELBeans.get(name);
vp.addELBean(name, value);
reader.addELBeanInstance(name, value);
}
vp.parseResource(res);
reader.readResource(res);
}
DefaultVascFactory.fillVascControllerLocalEntries((VascEntryControllerLocal) c.getVascEntryController(), c);
@ -159,12 +163,12 @@ abstract public class AbstractJSFVascFacesControllerLocal extends AbstractJSFVas
throw new VascFrontendException(e);
} catch (NullPointerException e) {
throw new VascFrontendException(e);
} catch (ParserConfigurationException e) {
throw new VascFrontendException(e);
} catch (SAXException e) {
throw new VascFrontendException(e);
} catch (IOException e) {
throw new VascFrontendException(e);
} catch (X4OConnectionException e) {
throw new VascFrontendException(e);
}
}