Menu
▾
▴
pfc-cvs-commit — CVS commit messages
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(155) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(240) |
Feb
(22) |
Mar
(50) |
Apr
(57) |
May
(2) |
Jun
(19) |
Jul
(223) |
Aug
(98) |
Sep
(31) |
Oct
(2) |
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
(5) |
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
(4) |
Aug
(7) |
Sep
(28) |
Oct
|
Nov
|
Dec
(3) |
| 2009 |
Jan
|
Feb
(10) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(9) |
Aug
(58) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Bavo De R. <ba...@us...> - 2010-08-13 17:06:15
|
Update of /cvsroot/pfc/pfc-api In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv6092 Modified Files: .cvsignore Log Message: Index: .cvsignore =================================================================== RCS file: /cvsroot/pfc/pfc-api/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** .cvsignore 7 Feb 2009 07:12:56 -0000 1.3 --- .cvsignore 13 Aug 2010 17:06:07 -0000 1.4 *************** *** 3,4 **** --- 3,5 ---- bin .settings + build |
|
From: Bavo De R. <ba...@us...> - 2010-08-13 16:17:34
|
Update of /cvsroot/pfc/pfc-demo In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv437 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/pfc/pfc-demo/build.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** build.xml 13 Sep 2005 11:35:08 -0000 1.18 --- build.xml 13 Aug 2010 16:17:26 -0000 1.19 *************** *** 38,46 **** </fileset> </classpath> - <classpath> - <fileset dir="../pfc-binding/build"> - <include name="*.jar" /> - </fileset> - </classpath> <include name="**" /> </javac> --- 38,41 ---- *************** *** 84,90 **** includes="*.jar" prefix="WEB-INF/lib" /> - <zipfileset dir="../pfc-binding/build" - includes="*.jar" - prefix="WEB-INF/lib" /> </zip> </target> --- 79,82 ---- |
|
From: Bavo De R. <ba...@us...> - 2010-08-13 16:17:27
|
Update of /cvsroot/pfc/pfc-build/repository/external In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv395/repository/external Removed Files: commons-logging.jar Log Message: --- commons-logging.jar DELETED --- |
|
From: Bavo De R. <ba...@us...> - 2010-08-13 16:17:27
|
Update of /cvsroot/pfc/pfc-build/repository/internal In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv395/repository/internal Added Files: commons-logging-1.1.1.jar log4j-1.2.16.jar Log Message: --- NEW FILE: log4j-1.2.16.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: commons-logging-1.1.1.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Bavo De R. <ba...@us...> - 2010-08-13 16:16:44
|
Update of /cvsroot/pfc/pfc-api/src/webapps/shared/WEB-INF/JS In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv32660/src/webapps/shared/WEB-INF/JS Removed Files: calendar-setup.js calendar.js calendar-en.js Log Message: --- calendar-setup.js DELETED --- --- calendar-en.js DELETED --- --- calendar.js DELETED --- |
|
From: Bavo De R. <ba...@us...> - 2010-08-13 16:16:26
|
Update of /cvsroot/pfc/pfc-rt In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv32589 Modified Files: .cvsignore Log Message: Index: .cvsignore =================================================================== RCS file: /cvsroot/pfc/pfc-rt/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** .cvsignore 15 Feb 2006 20:20:00 -0000 1.3 --- .cvsignore 13 Aug 2010 16:16:16 -0000 1.4 *************** *** 3,4 **** --- 3,5 ---- bin .settings + build |
|
From: Bavo De R. <ba...@us...> - 2010-08-12 16:39:47
|
Update of /cvsroot/pfc/pfc-demo In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv24984 Modified Files: .cvsignore Log Message: Index: .cvsignore =================================================================== RCS file: /cvsroot/pfc/pfc-demo/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** .cvsignore 29 Jul 2005 12:09:41 -0000 1.4 --- .cvsignore 12 Aug 2010 16:39:39 -0000 1.5 *************** *** 4,5 **** --- 4,6 ---- .classpath build.properties + .settings |
|
From: Bavo De R. <ba...@us...> - 2010-08-07 21:30:44
|
Update of /cvsroot/pfc/pfc-demo/src/java/portal/demo/listbox In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15113/src/java/portal/demo/listbox Modified Files: ListBoxDemoPanel.java ListBoxDemoInfo.java Log Message: Refactored to support generics. Added a default serialization id for all serializable classes. Index: ListBoxDemoInfo.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/listbox/ListBoxDemoInfo.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ListBoxDemoInfo.java 26 Jan 2005 20:15:04 -0000 1.3 --- ListBoxDemoInfo.java 7 Aug 2010 21:30:35 -0000 1.4 *************** *** 6,9 **** --- 6,11 ---- public class ListBoxDemoInfo implements DemoEntryInfo { + private static final long serialVersionUID = 1L; + public String getShortName() { Index: ListBoxDemoPanel.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/listbox/ListBoxDemoPanel.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ListBoxDemoPanel.java 13 Sep 2005 11:35:26 -0000 1.7 --- ListBoxDemoPanel.java 7 Aug 2010 21:30:35 -0000 1.8 *************** *** 12,15 **** --- 12,17 ---- public class ListBoxDemoPanel extends Panel implements DemoEntry { + private static final long serialVersionUID = 1L; + public ListBoxDemoPanel() { *************** *** 26,30 **** } ! public Component getComponent() { return this; --- 28,32 ---- } ! public Component<?> getComponent() { return this; *************** *** 40,44 **** private void createListModels() { ! _doubleListModel = new DefaultListDataModel(); _doubleListModel.addElement("Jan"); _doubleListModel.addElement("Piet"); --- 42,46 ---- private void createListModels() { ! _doubleListModel = new DefaultListDataModel<String>(); _doubleListModel.addElement("Jan"); _doubleListModel.addElement("Piet"); *************** *** 59,70 **** private void createDoubleListBox() { ! _doubleList = new DoubleListBox(_doubleListModel, _doubleSelection); add(_doubleList, "DoubleListTest"); } ! private DefaultListDataModel _doubleListModel; private DefaultSelectionModel _doubleSelection; ! private DoubleListBox _doubleList; } \ No newline at end of file --- 61,72 ---- private void createDoubleListBox() { ! _doubleList = new DoubleListBox<String>(_doubleListModel, _doubleSelection); add(_doubleList, "DoubleListTest"); } ! private DefaultListDataModel<String> _doubleListModel; private DefaultSelectionModel _doubleSelection; ! private DoubleListBox<String> _doubleList; } \ No newline at end of file |
|
From: Bavo De R. <ba...@us...> - 2010-08-07 21:30:43
|
Update of /cvsroot/pfc/pfc-demo/src/java/portal/demo/wait In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15113/src/java/portal/demo/wait Modified Files: WaitPagePanel.java WaitPageInfo.java Log Message: Refactored to support generics. Added a default serialization id for all serializable classes. Index: WaitPagePanel.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/wait/WaitPagePanel.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** WaitPagePanel.java 13 Sep 2005 11:35:26 -0000 1.5 --- WaitPagePanel.java 7 Aug 2010 21:30:35 -0000 1.6 *************** *** 10,13 **** --- 10,15 ---- public class WaitPagePanel extends Panel implements DemoEntry { + private static final long serialVersionUID = 1L; + public WaitPagePanel() { *************** *** 23,27 **** } ! public Component getComponent() { return this; --- 25,29 ---- } ! public Component<?> getComponent() { return this; *************** *** 37,40 **** --- 39,44 ---- startButton.setAction(new IAction() { + private static final long serialVersionUID = 1L; + public void doAction() { Index: WaitPageInfo.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/wait/WaitPageInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WaitPageInfo.java 18 Jul 2005 17:02:26 -0000 1.2 --- WaitPageInfo.java 7 Aug 2010 21:30:35 -0000 1.3 *************** *** 5,8 **** --- 5,10 ---- public class WaitPageInfo implements DemoEntryInfo { + private static final long serialVersionUID = 1L; + public String getShortName() { |
|
From: Bavo De R. <ba...@us...> - 2010-08-07 21:30:43
|
Update of /cvsroot/pfc/pfc-demo/src/java/portal/demo In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15113/src/java/portal/demo Modified Files: DemoChooser.java DemoManager.java StartDemoEvent.java DemoEntry.java DemoPortal.java Log Message: Refactored to support generics. Added a default serialization id for all serializable classes. Index: DemoManager.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/DemoManager.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DemoManager.java 13 Sep 2005 11:35:27 -0000 1.5 --- DemoManager.java 7 Aug 2010 21:30:35 -0000 1.6 *************** *** 11,14 **** --- 11,16 ---- public class DemoManager extends Panel { + private static final long serialVersionUID = 1L; + public DemoManager(EventBus eventBus) { *************** *** 58,61 **** --- 60,65 ---- private class StartDemoEventListener implements IEventBusListener { + private static final long serialVersionUID = 1L; + public void processEvent(EventObject event) { Index: DemoPortal.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/DemoPortal.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** DemoPortal.java 13 Sep 2005 11:35:27 -0000 1.15 --- DemoPortal.java 7 Aug 2010 21:30:35 -0000 1.16 *************** *** 2,5 **** --- 2,6 ---- import java.util.ArrayList; + import java.util.List; import portal.demo.binding.BindingLayoutInfo; *************** *** 19,22 **** --- 20,25 ---- public class DemoPortal implements IApplication { + private static final long serialVersionUID = 1L; + public DemoPortal() { *************** *** 46,50 **** } ! public Component getComponent() { return _rootPanel; --- 49,53 ---- } ! public Component<?> getComponent() { return _rootPanel; *************** *** 53,57 **** private void createDemoEntries() { ! ArrayList demoInfoEntries = new ArrayList(); demoInfoEntries.add(new ControlsDemoInfo()); --- 56,60 ---- private void createDemoEntries() { ! List<DemoEntryInfo> demoInfoEntries = new ArrayList<DemoEntryInfo>(); demoInfoEntries.add(new ControlsDemoInfo()); Index: StartDemoEvent.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/StartDemoEvent.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** StartDemoEvent.java 26 Jan 2005 20:15:20 -0000 1.2 --- StartDemoEvent.java 7 Aug 2010 21:30:35 -0000 1.3 *************** *** 5,8 **** --- 5,10 ---- public class StartDemoEvent extends EventObject { + private static final long serialVersionUID = 1L; + public StartDemoEvent(Object source, DemoEntryInfo entryInfo) { Index: DemoChooser.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/DemoChooser.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DemoChooser.java 13 Sep 2005 11:35:27 -0000 1.5 --- DemoChooser.java 7 Aug 2010 21:30:35 -0000 1.6 *************** *** 6,11 **** --- 6,13 ---- import java.util.Collection; import java.util.Iterator; + import java.util.List; import portal.eventbus.EventBus; + import portal.model.IModel; import portal.ui.Component; import portal.ui.IAction; *************** *** 13,19 **** import portal.ui.render.RenderException; ! public class DemoChooser extends Component { ! public DemoChooser(EventBus eventBus, Collection demoInfoEntries) { this._eventBus = eventBus; --- 15,23 ---- import portal.ui.render.RenderException; ! public class DemoChooser extends Component<IModel> { ! private static final long serialVersionUID = 1L; ! ! public DemoChooser(EventBus eventBus, Collection<DemoEntryInfo> demoInfoEntries) { this._eventBus = eventBus; *************** *** 22,34 **** } ! private void initChooser(Collection demoInfoEntries) { ! _demoChooserEntries = new ArrayList(); ! Iterator it = demoInfoEntries.iterator(); while (it.hasNext()) { ! DemoEntryInfo demoEntryInfo = (DemoEntryInfo) it.next(); DemoChooserEntry chooseEntry = new DemoChooserEntry(demoEntryInfo); --- 26,38 ---- } ! private void initChooser(Collection<DemoEntryInfo> demoInfoEntries) { ! _demoChooserEntries = new ArrayList<DemoChooserEntry>(); ! Iterator<DemoEntryInfo> it = demoInfoEntries.iterator(); while (it.hasNext()) { ! DemoEntryInfo demoEntryInfo = it.next(); DemoChooserEntry chooseEntry = new DemoChooserEntry(demoEntryInfo); *************** *** 46,50 **** Writer writer = pRenderContext.getWriter(); ! Iterator it = _demoChooserEntries.iterator(); int currentRow = 0; --- 50,54 ---- Writer writer = pRenderContext.getWriter(); ! Iterator<DemoChooserEntry> it = _demoChooserEntries.iterator(); int currentRow = 0; *************** *** 54,58 **** while (it.hasNext()) { ! Component child = (Component) it.next(); currentRow++; --- 58,62 ---- while (it.hasNext()) { ! DemoChooserEntry child = it.next(); currentRow++; *************** *** 92,99 **** private EventBus _eventBus; ! private ArrayList _demoChooserEntries; ! private class DemoChooserEntry extends Component implements IAction { public DemoChooserEntry(DemoEntryInfo demoEntryInfo) { --- 96,105 ---- private EventBus _eventBus; ! private List<DemoChooserEntry> _demoChooserEntries; ! private class DemoChooserEntry extends Component<IModel> implements IAction { + private static final long serialVersionUID = 1L; + public DemoChooserEntry(DemoEntryInfo demoEntryInfo) { Index: DemoEntry.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/DemoEntry.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DemoEntry.java 13 Sep 2005 11:35:27 -0000 1.3 --- DemoEntry.java 7 Aug 2010 21:30:35 -0000 1.4 *************** *** 11,14 **** void destroy(); ! Component getComponent(); } \ No newline at end of file --- 11,14 ---- void destroy(); ! Component<?> getComponent(); } \ No newline at end of file |
|
From: Bavo De R. <ba...@us...> - 2010-08-07 21:30:43
|
Update of /cvsroot/pfc/pfc-demo/src/java/portal/demo/binding/boundlistbox In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15113/src/java/portal/demo/binding/boundlistbox Modified Files: VelocityFileBoundList.java Log Message: Refactored to support generics. Added a default serialization id for all serializable classes. Index: VelocityFileBoundList.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/binding/boundlistbox/VelocityFileBoundList.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** VelocityFileBoundList.java 1 Sep 2006 19:37:54 -0000 1.14 --- VelocityFileBoundList.java 7 Aug 2010 21:30:35 -0000 1.15 *************** *** 1,18 **** package portal.demo.binding.boundlistbox; - import portal.binding.BindingException; - import portal.data.ICommand; - import portal.data.ICreateCommand; - import portal.data.IDataProvider; - import portal.data.IDataProviderSession; - import portal.data.IOpenRowset; - import portal.data.IRowset; - import portal.data.binding.ListDataModelBinding; - import portal.data.rt.csv.CSVDataProvider; - import portal.interfaces.OptionalInterfaceException; import portal.ui.comp.Panel; - import portal.ui.comp.list.DefaultSelectionModel; - import portal.ui.comp.list.DoubleListBox; - import portal.ui.comp.list.SelectionMode; import portal.ui.render.VelocityLayout; --- 1,5 ---- *************** *** 21,24 **** --- 8,13 ---- //private static final Log LOGGER = LogFactory.getLog(VelocityFileBoundList.class); + private static final long serialVersionUID = 1L; + public VelocityFileBoundList() { *************** *** 31,95 **** "portal/demo/binding/boundlistbox/FileBoundList.vm")); ! createNewBinding(); ! } ! ! private void createNewBinding() ! { ! try ! { ! //IDataProvider dataSource = new JDBCDataProvider("java:/MyLatteDB"); ! IDataProvider dataSource = new CSVDataProvider(); ! ! IDataProviderSession session = dataSource.createSession(); ! ! IRowset rowset = null; ! ! if (session.supportsInterface(ICreateCommand.class)) ! { ! ICreateCommand createCommand = (ICreateCommand) session.getInterface(ICreateCommand.class); ! ! ICommand cmd = createCommand.createCommand(); ! cmd.setText("select * from latte_user where enable='Y'"); ! ! rowset = cmd.execute(); ! } ! else if (session.supportsInterface(IOpenRowset.class)) ! { ! IOpenRowset openRowset = (IOpenRowset) session.getInterface(IOpenRowset.class); ! ! //rowset = openRowset.openRowset("latte_user"); ! rowset = openRowset.openRowset("/home/bderidder/test.csv"); ! } ! else ! { ! return; ! } ! ! //OfflineRowset offlineRowset = new OfflineRowset(rowset); ! ! //rowset.release(); ! session.close(); ! ! _newBindingBinder = new ListDataModelBinding(); ! ! _newBindingBinder.setRowset(rowset); ! _newBindingBinder.setColumnIndex(6); ! ! _newBindingListBox = new DoubleListBox(_newBindingBinder, ! new DefaultSelectionModel(SelectionMode.MULTIPLE_SELECTION)); ! ! add(_newBindingListBox, "BindingListBox"); ! } ! catch (BindingException e) ! { ! e.printStackTrace(); ! } ! catch (OptionalInterfaceException e) ! { ! e.printStackTrace(); ! } } ! private ListDataModelBinding _newBindingBinder; ! private DoubleListBox _newBindingListBox; } \ No newline at end of file --- 20,84 ---- "portal/demo/binding/boundlistbox/FileBoundList.vm")); ! // createNewBinding(); } ! // private void createNewBinding() ! // { ! // try ! // { ! // //IDataProvider dataSource = new JDBCDataProvider("java:/MyLatteDB"); ! // IDataProvider dataSource = new CSVDataProvider(); ! // ! // IDataProviderSession session = dataSource.createSession(); ! // ! // IRowset rowset = null; ! // ! // if (session.supportsInterface(ICreateCommand.class)) ! // { ! // ICreateCommand createCommand = (ICreateCommand) session.getInterface(ICreateCommand.class); ! // ! // ICommand cmd = createCommand.createCommand(); ! // cmd.setText("select * from latte_user where enable='Y'"); ! // ! // rowset = cmd.execute(); ! // } ! // else if (session.supportsInterface(IOpenRowset.class)) ! // { ! // IOpenRowset openRowset = (IOpenRowset) session.getInterface(IOpenRowset.class); ! // ! // //rowset = openRowset.openRowset("latte_user"); ! // rowset = openRowset.openRowset("/home/bderidder/test.csv"); ! // } ! // else ! // { ! // return; ! // } ! // ! // //OfflineRowset offlineRowset = new OfflineRowset(rowset); ! // ! // //rowset.release(); ! // session.close(); ! // ! // _newBindingBinder = new ListDataModelBinding(); ! // ! // _newBindingBinder.setRowset(rowset); ! // _newBindingBinder.setColumnIndex(6); ! // ! // _newBindingListBox = new DoubleListBox(_newBindingBinder, ! // new DefaultSelectionModel(SelectionMode.MULTIPLE_SELECTION)); ! // ! // add(_newBindingListBox, "BindingListBox"); ! // } ! // catch (BindingException e) ! // { ! // e.printStackTrace(); ! // } ! // catch (OptionalInterfaceException e) ! // { ! // e.printStackTrace(); ! // } ! // } ! // ! // private ListDataModelBinding _newBindingBinder; ! // private DoubleListBox _newBindingListBox; } \ No newline at end of file |
Update of /cvsroot/pfc/pfc-demo/src/java/portal/demo/desktop In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15113/src/java/portal/demo/desktop Modified Files: WindowList.java DemoFrame.java DemoFrameRenderer.java CloseFrameDialog.java DesktopDemoInfo.java DesktopDemoPanel.java Log Message: Refactored to support generics. Added a default serialization id for all serializable classes. Index: DemoFrameRenderer.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/desktop/DemoFrameRenderer.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DemoFrameRenderer.java 1 Sep 2006 19:37:54 -0000 1.5 --- DemoFrameRenderer.java 7 Aug 2010 21:30:34 -0000 1.6 *************** *** 13,16 **** --- 13,18 ---- public class DemoFrameRenderer implements FrameRenderer { + private static final long serialVersionUID = 1L; + public void renderFrame(IRenderContext pRenderContext, Frame frame) throws RenderException, IOException *************** *** 19,23 **** Label frameTitle = new Label(); ! frameTitle.getLabelModel().setString(frame.getTitle()); panel.add(frameTitle, "Title"); --- 21,25 ---- Label frameTitle = new Label(); ! frameTitle.getLabelModel().setValue(frame.getTitle()); panel.add(frameTitle, "Title"); Index: DesktopDemoPanel.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/desktop/DesktopDemoPanel.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** DesktopDemoPanel.java 13 Sep 2005 11:35:27 -0000 1.8 --- DesktopDemoPanel.java 7 Aug 2010 21:30:34 -0000 1.9 *************** *** 12,15 **** --- 12,17 ---- public class DesktopDemoPanel extends Panel implements DemoEntry { + private static final long serialVersionUID = 1L; + public DesktopDemoPanel() { *************** *** 25,29 **** } ! public Component getComponent() { return this; --- 27,31 ---- } ! public Component<?> getComponent() { return this; *************** *** 66,69 **** --- 68,73 ---- closeButton.setAction(new IAction() { + private static final long serialVersionUID = 1L; + public void doAction() { Index: CloseFrameDialog.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/desktop/CloseFrameDialog.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CloseFrameDialog.java 15 Feb 2006 20:48:39 -0000 1.9 --- CloseFrameDialog.java 7 Aug 2010 21:30:34 -0000 1.10 *************** *** 12,15 **** --- 12,16 ---- //private static final Log LOGGER = LogFactory.getLog(CloseFrameDialog.class); + private static final long serialVersionUID = 1L; public CloseFrameDialog(Frame frame) { *************** *** 48,52 **** { _frameName = new Label(); ! _frameName.getLabelModel().setString(_frame.getTitle()); _okButton = new Button(); --- 49,53 ---- { _frameName = new Label(); ! _frameName.getLabelModel().setValue(_frame.getTitle()); _okButton = new Button(); *************** *** 65,68 **** --- 66,71 ---- private class OkAction implements IAction { + private static final long serialVersionUID = 1L; + public void doAction() { *************** *** 75,78 **** --- 78,83 ---- private class CancelAction implements IAction { + private static final long serialVersionUID = 1L; + public void doAction() { Index: DesktopDemoInfo.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/desktop/DesktopDemoInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DesktopDemoInfo.java 26 Jan 2005 20:15:05 -0000 1.2 --- DesktopDemoInfo.java 7 Aug 2010 21:30:34 -0000 1.3 *************** *** 6,9 **** --- 6,11 ---- public class DesktopDemoInfo implements DemoEntryInfo { + private static final long serialVersionUID = 1L; + public String getShortName() { Index: DemoFrame.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/desktop/DemoFrame.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DemoFrame.java 13 Sep 2005 11:35:27 -0000 1.7 --- DemoFrame.java 7 Aug 2010 21:30:34 -0000 1.8 *************** *** 8,11 **** --- 8,13 ---- public class DemoFrame extends Frame { + private static final long serialVersionUID = 1L; + public DemoFrame() { *************** *** 23,26 **** --- 25,30 ---- closeButton.setAction(new IAction() { + private static final long serialVersionUID = 1L; + public void doAction() { Index: WindowList.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/desktop/WindowList.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** WindowList.java 13 Sep 2005 11:35:27 -0000 1.7 --- WindowList.java 7 Aug 2010 21:30:34 -0000 1.8 *************** *** 3,6 **** --- 3,7 ---- import java.util.ArrayList; import java.util.Iterator; + import java.util.List; import portal.ui.IAction; *************** *** 16,24 **** public class WindowList extends PanelDelegator { public WindowList(Desktop desktop) { this._desktop = desktop; ! _windows = new ArrayList(); desktop.addDesktopListener(new MyDesktopListener()); --- 17,27 ---- public class WindowList extends PanelDelegator { + private static final long serialVersionUID = 1L; + public WindowList(Desktop desktop) { this._desktop = desktop; ! _windows = new ArrayList<Frame>(); desktop.addDesktopListener(new MyDesktopListener()); *************** *** 31,38 **** getContentPanel().removeAll(); ! Iterator it = _windows.iterator(); while (it.hasNext()) { ! Frame frame = (Frame) it.next(); ActionLink link = new ActionLink(); --- 34,41 ---- getContentPanel().removeAll(); ! Iterator<Frame> it = _windows.iterator(); while (it.hasNext()) { ! Frame frame = it.next(); ActionLink link = new ActionLink(); *************** *** 46,49 **** --- 49,53 ---- private class MyDesktopListener implements DesktopListener { + private static final long serialVersionUID = 1L; public void frameAdded(DesktopEvent desktopEvent) *************** *** 60,63 **** --- 64,69 ---- private class FrameSelectAction implements IAction { + private static final long serialVersionUID = 1L; + public FrameSelectAction(Frame frame) { *************** *** 75,78 **** private Desktop _desktop; ! private ArrayList _windows; } \ No newline at end of file --- 81,84 ---- private Desktop _desktop; ! private List<Frame> _windows; } \ No newline at end of file |
|
From: Bavo De R. <ba...@us...> - 2010-08-07 21:30:43
|
Update of /cvsroot/pfc/pfc-demo/src/java/portal/demo/crash In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15113/src/java/portal/demo/crash Modified Files: CrashDemoPanel.java CrashDemoInfo.java Log Message: Refactored to support generics. Added a default serialization id for all serializable classes. Index: CrashDemoInfo.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/crash/CrashDemoInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CrashDemoInfo.java 26 Jan 2005 20:15:04 -0000 1.2 --- CrashDemoInfo.java 7 Aug 2010 21:30:35 -0000 1.3 *************** *** 6,9 **** --- 6,11 ---- public class CrashDemoInfo implements DemoEntryInfo { + private static final long serialVersionUID = 1L; + public String getShortName() { Index: CrashDemoPanel.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/crash/CrashDemoPanel.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CrashDemoPanel.java 13 Sep 2005 11:35:26 -0000 1.7 --- CrashDemoPanel.java 7 Aug 2010 21:30:35 -0000 1.8 *************** *** 10,13 **** --- 10,15 ---- public class CrashDemoPanel extends Panel implements DemoEntry { + private static final long serialVersionUID = 1L; + public CrashDemoPanel() { *************** *** 23,27 **** } ! public Component getComponent() { return this; --- 25,29 ---- } ! public Component<?> getComponent() { return this; *************** *** 37,40 **** --- 39,44 ---- crashMeButton.setAction(new IAction() { + private static final long serialVersionUID = 1L; + public void doAction() { |
|
From: Bavo De R. <ba...@us...> - 2010-08-07 21:30:43
|
Update of /cvsroot/pfc/pfc-demo/src/java/portal/demo/validation In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15113/src/java/portal/demo/validation Modified Files: DemoFormModel.java DemoForm.java ValidationDemoInfo.java ValidationDemoPanel.java Log Message: Refactored to support generics. Added a default serialization id for all serializable classes. Index: ValidationDemoPanel.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/validation/ValidationDemoPanel.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ValidationDemoPanel.java 13 Sep 2005 11:35:27 -0000 1.7 --- ValidationDemoPanel.java 7 Aug 2010 21:30:35 -0000 1.8 *************** *** 10,13 **** --- 10,15 ---- public class ValidationDemoPanel extends Panel implements DemoEntry { + private static final long serialVersionUID = 1L; + public ValidationDemoPanel() { *************** *** 23,27 **** } ! public Component getComponent() { return this; --- 25,29 ---- } ! public Component<?> getComponent() { return this; *************** *** 43,46 **** --- 45,50 ---- validateButton.setAction(new IAction() { + private static final long serialVersionUID = 1L; + public void doAction() { Index: DemoForm.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/validation/DemoForm.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** DemoForm.java 13 Sep 2005 11:35:27 -0000 1.9 --- DemoForm.java 7 Aug 2010 21:30:35 -0000 1.10 *************** *** 11,14 **** --- 11,16 ---- public class DemoForm extends PanelDelegator { + private static final long serialVersionUID = 1L; + public DemoForm(DemoFormModel demoFormModel) { Index: ValidationDemoInfo.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/validation/ValidationDemoInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ValidationDemoInfo.java 26 Jan 2005 20:15:20 -0000 1.2 --- ValidationDemoInfo.java 7 Aug 2010 21:30:35 -0000 1.3 *************** *** 6,9 **** --- 6,11 ---- public class ValidationDemoInfo implements DemoEntryInfo { + private static final long serialVersionUID = 1L; + public String getShortName() { Index: DemoFormModel.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/validation/DemoFormModel.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DemoFormModel.java 13 Sep 2005 11:35:27 -0000 1.6 --- DemoFormModel.java 7 Aug 2010 21:30:35 -0000 1.7 *************** *** 7,10 **** --- 7,12 ---- public class DemoFormModel implements IModel { + private static final long serialVersionUID = 1L; + public DemoFormModel() { |
|
From: Bavo De R. <ba...@us...> - 2010-08-07 21:30:43
|
Update of /cvsroot/pfc/pfc-demo/src/java/portal/demo/validation/phone In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15113/src/java/portal/demo/validation/phone Modified Files: PhoneNumber.java PhoneNumberForm.java Log Message: Refactored to support generics. Added a default serialization id for all serializable classes. Index: PhoneNumber.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/validation/phone/PhoneNumber.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PhoneNumber.java 13 Sep 2005 11:35:26 -0000 1.4 --- PhoneNumber.java 7 Aug 2010 21:30:35 -0000 1.5 *************** *** 7,10 **** --- 7,12 ---- public class PhoneNumber implements IModel { + private static final long serialVersionUID = 1L; + public PhoneNumber() { Index: PhoneNumberForm.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/validation/phone/PhoneNumberForm.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PhoneNumberForm.java 13 Sep 2005 11:35:26 -0000 1.2 --- PhoneNumberForm.java 7 Aug 2010 21:30:35 -0000 1.3 *************** *** 10,13 **** --- 10,15 ---- public class PhoneNumberForm extends PanelDelegator implements IValidatable { + private static final long serialVersionUID = 1L; + public PhoneNumberForm() { |
|
From: Bavo De R. <ba...@us...> - 2010-08-07 21:30:43
|
Update of /cvsroot/pfc/pfc-demo/src/java/portal/demo/velocity In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15113/src/java/portal/demo/velocity Modified Files: SimpleLayoutDemoInfo.java VelocityDemoPanel.java LayoutDemoPanel.java SimpleLayoutDemo.java Log Message: Refactored to support generics. Added a default serialization id for all serializable classes. Index: SimpleLayoutDemoInfo.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/velocity/SimpleLayoutDemoInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SimpleLayoutDemoInfo.java 26 Jan 2005 20:15:06 -0000 1.2 --- SimpleLayoutDemoInfo.java 7 Aug 2010 21:30:35 -0000 1.3 *************** *** 6,9 **** --- 6,11 ---- public class SimpleLayoutDemoInfo implements DemoEntryInfo { + private static final long serialVersionUID = 1L; + public String getShortName() { Index: SimpleLayoutDemo.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/velocity/SimpleLayoutDemo.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SimpleLayoutDemo.java 13 Sep 2005 11:35:27 -0000 1.3 --- SimpleLayoutDemo.java 7 Aug 2010 21:30:35 -0000 1.4 *************** *** 8,11 **** --- 8,13 ---- public class SimpleLayoutDemo extends Panel implements DemoEntry { + private static final long serialVersionUID = 1L; + public SimpleLayoutDemo() { *************** *** 27,31 **** } ! public Component getComponent() { return this; --- 29,33 ---- } ! public Component<?> getComponent() { return this; Index: LayoutDemoPanel.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/velocity/LayoutDemoPanel.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** LayoutDemoPanel.java 13 Sep 2005 11:35:27 -0000 1.6 --- LayoutDemoPanel.java 7 Aug 2010 21:30:35 -0000 1.7 *************** *** 13,16 **** --- 13,18 ---- public class LayoutDemoPanel extends Panel { + private static final long serialVersionUID = 1L; + public LayoutDemoPanel() { *************** *** 28,35 **** _greetingLabel = new Label(); ! _greetingLabel.getLabelModel().setString("Hello"); label = new Label(); ! label.getLabelModel().setString("Your name:"); _textInput = new TextInput(); --- 30,37 ---- _greetingLabel = new Label(); ! _greetingLabel.getLabelModel().setValue("Hello"); label = new Label(); ! label.getLabelModel().setValue("Your name:"); _textInput = new TextInput(); *************** *** 59,66 **** private class MyAction implements IAction { public void doAction() { ! _greetingLabel.getLabelModel().setString( ! "Hello " + _textInput.getStringModel().getString()); } } --- 61,70 ---- private class MyAction implements IAction { + private static final long serialVersionUID = 1L; + public void doAction() { ! _greetingLabel.getLabelModel().setValue( ! "Hello " + _textInput.getStringModel().getValue()); } } Index: VelocityDemoPanel.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/velocity/VelocityDemoPanel.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** VelocityDemoPanel.java 13 Sep 2005 11:35:27 -0000 1.6 --- VelocityDemoPanel.java 7 Aug 2010 21:30:35 -0000 1.7 *************** *** 10,13 **** --- 10,15 ---- public class VelocityDemoPanel extends Panel { + private static final long serialVersionUID = 1L; + public VelocityDemoPanel() { *************** *** 21,25 **** _label = new Label(); ! _label.getLabelModel().setString("Hello"); _textInput = new TextInput(); --- 23,27 ---- _label = new Label(); ! _label.getLabelModel().setValue("Hello"); _textInput = new TextInput(); *************** *** 40,47 **** private class MyAction implements IAction { public void doAction() { ! _label.getLabelModel().setString( ! "Hello " + _textInput.getStringModel().getString()); } } --- 42,51 ---- private class MyAction implements IAction { + private static final long serialVersionUID = 1L; + public void doAction() { ! _label.getLabelModel().setValue( ! "Hello " + _textInput.getStringModel().getValue()); } } |
|
From: Bavo De R. <ba...@us...> - 2010-08-07 21:30:43
|
Update of /cvsroot/pfc/pfc-demo/src/java/portal/demo/controls In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15113/src/java/portal/demo/controls Modified Files: ControlsDemoInfo.java ControlsDemoPanel.java Log Message: Refactored to support generics. Added a default serialization id for all serializable classes. Index: ControlsDemoPanel.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/controls/ControlsDemoPanel.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ControlsDemoPanel.java 15 Feb 2006 20:48:39 -0000 1.12 --- ControlsDemoPanel.java 7 Aug 2010 21:30:35 -0000 1.13 *************** *** 18,21 **** --- 18,23 ---- //private static final Log LOGGER = LogFactory.getLog(ControlsDemoPanel.class); + private static final long serialVersionUID = 1L; + public static final IconResource TEST_ICON = new IconResource("test.png", "image/png"); *************** *** 36,40 **** } ! public Component getComponent() { return this; --- 38,42 ---- } ! public Component<?> getComponent() { return this; *************** *** 47,59 **** _textInput = new TextInput(); ! _textInput.getStringModel().setString("Edit me"); add(_textInput, "TextInput"); _label = new Label(); ! _label.getLabelModel().setString("This is a label."); add(_label, "Label"); TextArea textArea = new TextArea(); ! textArea.getStringModel().setString("Edit me"); add(textArea, "TextArea"); --- 49,61 ---- _textInput = new TextInput(); ! _textInput.getStringModel().setValue("Edit me"); add(_textInput, "TextInput"); _label = new Label(); ! _label.getLabelModel().setValue("This is a label."); add(_label, "Label"); TextArea textArea = new TextArea(); ! textArea.getStringModel().setValue("Edit me"); add(textArea, "TextArea"); *************** *** 66,73 **** button.setAction(new IAction() { public void doAction() { ! _label.getLabelModel().setString( ! _textInput.getStringModel().getString()); } }); --- 68,77 ---- button.setAction(new IAction() { + private static final long serialVersionUID = 1L; + public void doAction() { ! _label.getLabelModel().setValue( ! _textInput.getStringModel().getValue()); } }); Index: ControlsDemoInfo.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/controls/ControlsDemoInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ControlsDemoInfo.java 26 Jan 2005 20:15:05 -0000 1.2 --- ControlsDemoInfo.java 7 Aug 2010 21:30:35 -0000 1.3 *************** *** 6,9 **** --- 6,11 ---- public class ControlsDemoInfo implements DemoEntryInfo { + private static final long serialVersionUID = 1L; + public String getShortName() { |
|
From: Bavo De R. <ba...@us...> - 2010-08-07 21:30:43
|
Update of /cvsroot/pfc/pfc-demo/src/java/portal/demo/validation/address In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15113/src/java/portal/demo/validation/address Modified Files: StreetAddressForm.java StreetAddress.java Log Message: Refactored to support generics. Added a default serialization id for all serializable classes. Index: StreetAddress.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/validation/address/StreetAddress.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** StreetAddress.java 13 Sep 2005 11:35:26 -0000 1.5 --- StreetAddress.java 7 Aug 2010 21:30:35 -0000 1.6 *************** *** 7,10 **** --- 7,12 ---- public class StreetAddress implements IModel { + private static final long serialVersionUID = 1L; + public StreetAddress() { Index: StreetAddressForm.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/validation/address/StreetAddressForm.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** StreetAddressForm.java 13 Sep 2005 11:35:26 -0000 1.4 --- StreetAddressForm.java 7 Aug 2010 21:30:35 -0000 1.5 *************** *** 10,13 **** --- 10,15 ---- public class StreetAddressForm extends PanelDelegator implements IValidatable { + private static final long serialVersionUID = 1L; + public StreetAddressForm() { |
|
From: Bavo De R. <ba...@us...> - 2010-08-07 21:30:43
|
Update of /cvsroot/pfc/pfc-demo/src/java/portal/demo/binding In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15113/src/java/portal/demo/binding Modified Files: BindingLayoutInfo.java BindingLayout.java Log Message: Refactored to support generics. Added a default serialization id for all serializable classes. Index: BindingLayout.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/binding/BindingLayout.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** BindingLayout.java 13 Sep 2005 11:35:26 -0000 1.5 --- BindingLayout.java 7 Aug 2010 21:30:35 -0000 1.6 *************** *** 7,10 **** --- 7,12 ---- public class BindingLayout implements DemoEntry { + private static final long serialVersionUID = 1L; + public BindingLayout() { *************** *** 20,24 **** } ! public Component getComponent() { return _velocityFileBoundList; --- 22,26 ---- } ! public Component<?> getComponent() { return _velocityFileBoundList; Index: BindingLayoutInfo.java =================================================================== RCS file: /cvsroot/pfc/pfc-demo/src/java/portal/demo/binding/BindingLayoutInfo.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BindingLayoutInfo.java 29 Jul 2005 12:08:20 -0000 1.4 --- BindingLayoutInfo.java 7 Aug 2010 21:30:35 -0000 1.5 *************** *** 6,9 **** --- 6,11 ---- public class BindingLayoutInfo implements DemoEntryInfo { + private static final long serialVersionUID = 1L; + public String getShortName() { |
|
From: Bavo De R. <ba...@us...> - 2010-08-07 11:07:10
|
Update of /cvsroot/pfc/pfc-rt/src/java/portal/rt/ui In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv11634/src/java/portal/rt/ui Modified Files: SystemDesktopState.java ErrorDesktop.java LoginDesktop.java SystemChildDesktop.java UpdaterMap.java ErrorState.java ActionMap.java SystemDesktop.java ApplicationDesktop.java Log Message: Refactored to support generics. Added a default serialization id for all serializable classes. Index: ErrorDesktop.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/ui/ErrorDesktop.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ErrorDesktop.java 30 Jul 2010 21:25:00 -0000 1.2 --- ErrorDesktop.java 7 Aug 2010 11:06:58 -0000 1.3 *************** *** 41,44 **** --- 41,46 ---- public class ErrorDesktop implements SystemChildDesktop { + private static final long serialVersionUID = 1L; + private static final Log LOGGER = LogFactory.getLog(ErrorDesktop.class); *************** *** 85,89 **** } ! public Component getRootComponent() { return _panel; --- 87,91 ---- } ! public Component<?> getRootComponent() { return _panel; *************** *** 111,114 **** --- 113,121 ---- private class OkAction implements IAction { + /** + * + */ + private static final long serialVersionUID = 1L; + public void doAction() { Index: ActionMap.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/ui/ActionMap.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ActionMap.java 13 Sep 2005 11:28:01 -0000 1.1 --- ActionMap.java 7 Aug 2010 11:06:58 -0000 1.2 *************** *** 24,29 **** import java.io.Serializable; ! import java.util.Hashtable; import java.util.Iterator; import portal.ui.IAction; --- 24,30 ---- import java.io.Serializable; ! import java.util.HashMap; import java.util.Iterator; + import java.util.Map; import portal.ui.IAction; *************** *** 32,38 **** public final class ActionMap implements Serializable { public ActionMap() { ! _actions = new Hashtable(); } --- 33,41 ---- public final class ActionMap implements Serializable { + private static final long serialVersionUID = 1L; + public ActionMap() { ! _actions = new HashMap<String,IAction>(); } *************** *** 46,50 **** } ! public Iterator getKeyIterator() { return _actions.keySet().iterator(); --- 49,53 ---- } ! public Iterator<String> getKeyIterator() { return _actions.keySet().iterator(); *************** *** 61,64 **** } ! private Hashtable _actions; } \ No newline at end of file --- 64,67 ---- } ! private Map<String,IAction> _actions; } \ No newline at end of file Index: ErrorState.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/ui/ErrorState.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ErrorState.java 13 Sep 2005 11:28:01 -0000 1.1 --- ErrorState.java 7 Aug 2010 11:06:58 -0000 1.2 *************** *** 27,30 **** --- 27,32 ---- public class ErrorState implements Serializable { + private static final long serialVersionUID = 1L; + public ErrorState(Throwable throwable) { Index: SystemDesktopState.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/ui/SystemDesktopState.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SystemDesktopState.java 22 Sep 2005 17:18:01 -0000 1.2 --- SystemDesktopState.java 7 Aug 2010 11:06:58 -0000 1.3 *************** *** 27,30 **** --- 27,32 ---- public final class SystemDesktopState implements Serializable { + private static final long serialVersionUID = 1L; + public static final SystemDesktopState LOGIN = new SystemDesktopState( "LOGIN"); Index: SystemDesktop.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/ui/SystemDesktop.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SystemDesktop.java 3 Sep 2006 21:03:50 -0000 1.3 --- SystemDesktop.java 7 Aug 2010 11:06:58 -0000 1.4 *************** *** 42,45 **** --- 42,47 ---- public class SystemDesktop implements Serializable { + private static final long serialVersionUID = 1L; + private static final String VELOCITY_TEMPLATE_CONTENT_KEY = "Content"; private static final String REGISTRY_KEY_DESKTOP_TEMPLATE = "portal.application.DesktopTemplate"; *************** *** 105,109 **** } ! public Component getRootComponent() { return _rootPanel; --- 107,111 ---- } ! public Component<?> getRootComponent() { return _rootPanel; *************** *** 262,265 **** --- 264,269 ---- private class StateController implements SystemDesktopStateController { + private static final long serialVersionUID = 1L; + public SystemDesktopState getCurrentState() { Index: LoginDesktop.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/ui/LoginDesktop.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LoginDesktop.java 13 Sep 2005 11:28:01 -0000 1.1 --- LoginDesktop.java 7 Aug 2010 11:06:58 -0000 1.2 *************** *** 43,46 **** --- 43,48 ---- public class LoginDesktop implements SystemChildDesktop { + private static final long serialVersionUID = 1L; + private static final Log LOGGER = LogFactory.getLog(LoginDesktop.class); *************** *** 66,70 **** LOGGER.debug("Instantiating login client: " + className); ! Class clazz = Class.forName(className); _loginClient = (LoginClient) clazz.newInstance(); --- 68,72 ---- LOGGER.debug("Instantiating login client: " + className); ! Class<?> clazz = Class.forName(className); _loginClient = (LoginClient) clazz.newInstance(); *************** *** 85,89 **** } ! public Component getRootComponent() { return _proxy; --- 87,91 ---- } ! public Component<?> getRootComponent() { return _proxy; *************** *** 137,140 **** --- 139,144 ---- private class PortalLoginCallback implements LoginCallback { + private static final long serialVersionUID = 1L; + public boolean login(String username, String password) { Index: SystemChildDesktop.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/ui/SystemChildDesktop.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SystemChildDesktop.java 13 Sep 2005 11:28:01 -0000 1.1 --- SystemChildDesktop.java 7 Aug 2010 11:06:58 -0000 1.2 *************** *** 35,38 **** String getTitle(); ! Component getRootComponent(); } \ No newline at end of file --- 35,38 ---- String getTitle(); ! Component<?> getRootComponent(); } \ No newline at end of file Index: UpdaterMap.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/ui/UpdaterMap.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** UpdaterMap.java 13 Sep 2005 11:28:01 -0000 1.1 --- UpdaterMap.java 7 Aug 2010 11:06:58 -0000 1.2 *************** *** 24,29 **** import java.io.Serializable; ! import java.util.Hashtable; import java.util.Iterator; import portal.ui.IUpdater; --- 24,30 ---- import java.io.Serializable; ! import java.util.HashMap; import java.util.Iterator; + import java.util.Map; import portal.ui.IUpdater; *************** *** 32,38 **** public final class UpdaterMap implements Serializable { public UpdaterMap() { ! _updaters = new Hashtable(); } --- 33,41 ---- public final class UpdaterMap implements Serializable { + private static final long serialVersionUID = 1L; + public UpdaterMap() { ! _updaters = new HashMap<String,IUpdater>(); } *************** *** 56,60 **** } ! public Iterator getKeyIterator() { return _updaters.keySet().iterator(); --- 59,63 ---- } ! public Iterator<String> getKeyIterator() { return _updaters.keySet().iterator(); *************** *** 71,74 **** } ! private Hashtable _updaters; } \ No newline at end of file --- 74,77 ---- } ! private Map<String,IUpdater> _updaters; } \ No newline at end of file Index: ApplicationDesktop.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/ui/ApplicationDesktop.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ApplicationDesktop.java 3 Sep 2006 21:03:50 -0000 1.4 --- ApplicationDesktop.java 7 Aug 2010 11:06:58 -0000 1.5 *************** *** 42,45 **** --- 42,47 ---- public class ApplicationDesktop implements SystemChildDesktop { + private static final long serialVersionUID = 1L; + private static final Log LOGGER = LogFactory.getLog(ApplicationDesktop.class); *************** *** 158,162 **** } ! public Component getRootComponent() { return _proxy; --- 160,164 ---- } ! public Component<?> getRootComponent() { return _proxy; |
|
From: Bavo De R. <ba...@us...> - 2010-08-07 11:07:09
|
Update of /cvsroot/pfc/pfc-rt/src/java/portal/rt/js In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv11634/src/java/portal/rt/js Modified Files: JavaScriptManager.java Log Message: Refactored to support generics. Added a default serialization id for all serializable classes. Index: JavaScriptManager.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/js/JavaScriptManager.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JavaScriptManager.java 3 Sep 2006 20:58:52 -0000 1.1 --- JavaScriptManager.java 7 Aug 2010 11:06:58 -0000 1.2 *************** *** 28,31 **** --- 28,32 ---- import java.util.Iterator; import java.util.LinkedList; + import java.util.List; import javax.servlet.http.HttpServletResponse; *************** *** 39,43 **** public JavaScriptManager() { ! _scriptBodies = new LinkedList(); } --- 40,44 ---- public JavaScriptManager() { ! _scriptBodies = new LinkedList<IScriptBody>(); } *************** *** 58,65 **** PrintWriter writer = new PrintWriter(charWriter); ! Iterator it = _scriptBodies.iterator(); while (it.hasNext()) { ! IScriptBody scriptBody = (IScriptBody) it.next(); writer.println("<script type=\"text/javascript\">"); --- 59,66 ---- PrintWriter writer = new PrintWriter(charWriter); ! Iterator<IScriptBody> it = _scriptBodies.iterator(); while (it.hasNext()) { ! IScriptBody scriptBody = it.next(); writer.println("<script type=\"text/javascript\">"); *************** *** 83,86 **** } ! private LinkedList _scriptBodies; } --- 84,87 ---- } ! private List<IScriptBody> _scriptBodies; } |
|
From: Bavo De R. <ba...@us...> - 2010-08-07 11:07:06
|
Update of /cvsroot/pfc/pfc-rt/src/java/portal/rt/debug In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv11634/src/java/portal/rt/debug Modified Files: DebugUtils.java Log Message: Refactored to support generics. Added a default serialization id for all serializable classes. Index: DebugUtils.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/debug/DebugUtils.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DebugUtils.java 13 Sep 2005 11:28:01 -0000 1.1 --- DebugUtils.java 7 Aug 2010 11:06:58 -0000 1.2 *************** *** 32,38 **** private static final Log LOGGER = LogFactory.getLog(DebugUtils.class); ! public static void dumpComponentStack(Component comp) { ! Component parent = comp; while (parent != null) --- 32,38 ---- private static final Log LOGGER = LogFactory.getLog(DebugUtils.class); ! public static void dumpComponentStack(Component<?> comp) { ! Component<?> parent = comp; while (parent != null) |
|
From: Bavo De R. <ba...@us...> - 2010-08-07 11:07:06
|
Update of /cvsroot/pfc/pfc-rt/src/java/portal/rt/services In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv11634/src/java/portal/rt/services Modified Files: ServiceXMLConfiguration.java NewServiceEvent.java ServiceConfigurator.java IServiceLifeCycleListener.java ServiceController.java StateChangedEvent.java ServiceManager.java Log Message: Refactored to support generics. Added a default serialization id for all serializable classes. Index: ServiceXMLConfiguration.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/services/ServiceXMLConfiguration.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ServiceXMLConfiguration.java 13 Sep 2005 11:28:01 -0000 1.1 --- ServiceXMLConfiguration.java 7 Aug 2010 11:06:58 -0000 1.2 *************** *** 75,89 **** } ! public Class[] getInterfaceClasses() { return _interfaceClasses; } ! public Class getControllerClass() { return _controllerClass; } ! public Set getAttributeNames() { return _attributes.keySet(); --- 75,89 ---- } ! public Class<?>[] getInterfaceClasses() { return _interfaceClasses; } ! public Class<?> getControllerClass() { return _controllerClass; } ! public Set<String> getAttributeNames() { return _attributes.keySet(); *************** *** 102,113 **** } ! public Class[] getDependencies() { return _dependencies; } ! public Set getResourcePaths(String basePath) throws ServiceException { ! return _context.getResourcePaths(basePath); } --- 102,114 ---- } ! public Class<?>[] getDependencies() { return _dependencies; } ! @SuppressWarnings("unchecked") ! public Set<String> getResourcePaths(String basePath) throws ServiceException { ! return (Set<String>)_context.getResourcePaths(basePath); } *************** *** 118,122 **** } ! private Class resolveClass(String className) throws ServiceException { try --- 119,123 ---- } ! private Class<?> resolveClass(String className) throws ServiceException { try *************** *** 141,147 **** _interfaceClasses = readInterfaces(root.element("interfaces")); ! _attributes = new Hashtable(); ! for (Iterator i = root.elementIterator("attribute"); i.hasNext();) { Element attributeElement = (Element) i.next(); --- 142,148 ---- _interfaceClasses = readInterfaces(root.element("interfaces")); ! _attributes = new Hashtable<String,String>(); ! for (Iterator<?> i = root.elementIterator("attribute"); i.hasNext();) { Element attributeElement = (Element) i.next(); *************** *** 158,165 **** } ! private Class[] readInterfaces(Element interfacesElem) throws ServiceException { ! List intList = interfacesElem.elements("interface"); if (intList.size() == 0) --- 159,166 ---- } ! private Class<?>[] readInterfaces(Element interfacesElem) throws ServiceException { ! List<?> intList = interfacesElem.elements("interface"); if (intList.size() == 0) *************** *** 169,173 **** } ! Class[] interfaces = new Class[intList.size()]; for (int i = 0; i != intList.size(); i++) --- 170,174 ---- } ! Class<?>[] interfaces = new Class[intList.size()]; for (int i = 0; i != intList.size(); i++) *************** *** 179,186 **** } ! private Class[] readDependencies(Element dependenciesElem) throws ServiceException { ! List depList = dependenciesElem.elements("dependency"); if (depList.size() == 0) --- 180,187 ---- } ! private Class<?>[] readDependencies(Element dependenciesElem) throws ServiceException { ! List<?> depList = dependenciesElem.elements("dependency"); if (depList.size() == 0) *************** *** 189,193 **** } ! Class[] deps = new Class[depList.size()]; for (int i = 0; i != depList.size(); i++) --- 190,194 ---- } ! Class<?>[] deps = new Class[depList.size()]; for (int i = 0; i != depList.size(); i++) *************** *** 203,210 **** private String _serviceName; ! private Class _controllerClass; ! private Class[] _interfaceClasses; ! private Class[] _dependencies; ! private Hashtable _attributes; } \ No newline at end of file --- 204,211 ---- private String _serviceName; ! private Class<?> _controllerClass; ! private Class<?>[] _interfaceClasses; ! private Class<?>[] _dependencies; ! private Hashtable<String,String> _attributes; } \ No newline at end of file Index: StateChangedEvent.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/services/StateChangedEvent.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StateChangedEvent.java 13 Sep 2005 11:28:01 -0000 1.1 --- StateChangedEvent.java 7 Aug 2010 11:06:58 -0000 1.2 *************** *** 29,33 **** public class StateChangedEvent extends EventObject { ! public StateChangedEvent(Object source, Class[] serviceClasses, ServiceState oldState, ServiceState newState) { --- 29,35 ---- public class StateChangedEvent extends EventObject { ! private static final long serialVersionUID = 1L; ! ! public StateChangedEvent(Object source, Class<?>[] serviceClasses, ServiceState oldState, ServiceState newState) { *************** *** 39,43 **** } ! public Class[] getServiceClasses() { return _serviceClasses; --- 41,45 ---- } ! public Class<?>[] getServiceClasses() { return _serviceClasses; *************** *** 54,58 **** } ! private Class[] _serviceClasses; private ServiceState _oldState; private ServiceState _newState; --- 56,60 ---- } ! private Class<?>[] _serviceClasses; private ServiceState _oldState; private ServiceState _newState; Index: ServiceConfigurator.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/services/ServiceConfigurator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ServiceConfigurator.java 13 Sep 2005 11:28:01 -0000 1.1 --- ServiceConfigurator.java 7 Aug 2010 11:06:58 -0000 1.2 *************** *** 38,41 **** --- 38,43 ---- public class ServiceConfigurator extends HttpServlet { + private static final long serialVersionUID = 1L; + private static final Log LOGGER = LogFactory.getLog(ServiceConfigurator.class); *************** *** 52,56 **** ServletContext context = getServletConfig().getServletContext(); ! Set services = context.getResourcePaths(SERVICES_RESOURCE_PATH); configureServices(services, serviceManager); --- 54,58 ---- ServletContext context = getServletConfig().getServletContext(); ! Set<?> services = context.getResourcePaths(SERVICES_RESOURCE_PATH); configureServices(services, serviceManager); *************** *** 67,76 **** } ! private void configureServices(Set services, ServiceManager serviceManager) throws Exception { ServletContext context = getServletConfig().getServletContext(); ! Iterator it = services.iterator(); while (it.hasNext()) --- 69,78 ---- } ! private void configureServices(Set<?> services, ServiceManager serviceManager) throws Exception { ServletContext context = getServletConfig().getServletContext(); ! Iterator<?> it = services.iterator(); while (it.hasNext()) Index: NewServiceEvent.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/services/NewServiceEvent.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** NewServiceEvent.java 13 Sep 2005 11:28:01 -0000 1.1 --- NewServiceEvent.java 7 Aug 2010 11:06:58 -0000 1.2 *************** *** 27,31 **** public class NewServiceEvent extends EventObject { ! public NewServiceEvent(Object source, Class[] serviceClasses) { super(source); --- 27,33 ---- public class NewServiceEvent extends EventObject { ! private static final long serialVersionUID = 1L; ! ! public NewServiceEvent(Object source, Class<?>[] serviceClasses) { super(source); *************** *** 34,42 **** } ! public Class[] getServiceClasses() { return _serviceClasses; } ! private Class[] _serviceClasses; } \ No newline at end of file --- 36,44 ---- } ! public Class<?>[] getServiceClasses() { return _serviceClasses; } ! private Class<?>[] _serviceClasses; } \ No newline at end of file Index: ServiceManager.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/services/ServiceManager.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ServiceManager.java 13 Sep 2005 11:28:01 -0000 1.1 --- ServiceManager.java 7 Aug 2010 11:06:58 -0000 1.2 *************** *** 26,29 **** --- 26,30 ---- import java.util.ArrayList; import java.util.Iterator; + import java.util.List; import javax.servlet.ServletContext; *************** *** 44,48 **** { _eventBus = new EventBus(); ! _services = new ArrayList(); ServiceLocator.setServiceLocator(this); --- 45,49 ---- { _eventBus = new EventBus(); ! _services = new ArrayList<ServiceController>(); ServiceLocator.setServiceLocator(this); *************** *** 54,58 **** } ! public ServiceController getInstanceManagerForService(Class interfaceRequired) throws ServiceException { --- 55,59 ---- } ! public ServiceController getInstanceManagerForService(Class<?> interfaceRequired) throws ServiceException { *************** *** 60,68 **** + interfaceRequired.getName()); ! Iterator it = _services.iterator(); while (it.hasNext()) { ! ServiceController serviceInstance = (ServiceController) it.next(); if (serviceInstance.implementsInterface(interfaceRequired)) --- 61,69 ---- + interfaceRequired.getName()); ! Iterator<ServiceController> it = _services.iterator(); while (it.hasNext()) { ! ServiceController serviceInstance = it.next(); if (serviceInstance.implementsInterface(interfaceRequired)) *************** *** 77,81 **** } ! public IService locateService(Class interfaceRequired) throws ServiceException { --- 78,82 ---- } ! public IService locateService(Class<?> interfaceRequired) throws ServiceException { *************** *** 111,114 **** private EventBus _eventBus; ! private ArrayList _services; } \ No newline at end of file --- 112,115 ---- private EventBus _eventBus; ! private List<ServiceController> _services; } \ No newline at end of file Index: IServiceLifeCycleListener.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/services/IServiceLifeCycleListener.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** IServiceLifeCycleListener.java 13 Sep 2005 11:28:01 -0000 1.1 --- IServiceLifeCycleListener.java 7 Aug 2010 11:06:58 -0000 1.2 *************** *** 25,28 **** public interface IServiceLifeCycleListener { ! void stateChanged(Class interfaceClass, int oldState, int newState); } \ No newline at end of file --- 25,28 ---- public interface IServiceLifeCycleListener { ! void stateChanged(Class<?> interfaceClass, int oldState, int newState); } \ No newline at end of file Index: ServiceController.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/services/ServiceController.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ServiceController.java 13 Sep 2005 11:28:01 -0000 1.1 --- ServiceController.java 7 Aug 2010 11:06:58 -0000 1.2 *************** *** 50,56 **** } ! public boolean implementsInterface(Class interfaceClass) { ! Class[] interfaces = _serviceConfig.getInterfaceClasses(); for (int i = 0; i != interfaces.length; i++) --- 50,56 ---- } ! public boolean implementsInterface(Class<?> interfaceClass) { ! Class<?>[] interfaces = _serviceConfig.getInterfaceClasses(); for (int i = 0; i != interfaces.length; i++) *************** *** 134,138 **** private void initDependencies() throws ServiceException { ! Class[] dependencies = _serviceConfig.getDependencies(); if (dependencies == null) --- 134,138 ---- private void initDependencies() throws ServiceException { ! Class<?>[] dependencies = _serviceConfig.getDependencies(); if (dependencies == null) *************** *** 176,184 **** try { ! Class[] interfaceClasses = event.getServiceClasses(); for (int i = 0; i != interfaceClasses.length; i++) { ! Class interfaceClass = interfaceClasses[i]; if ((event.getNewState() == ServiceState.RUNNING) --- 176,184 ---- try { ! Class<?>[] interfaceClasses = event.getServiceClasses(); for (int i = 0; i != interfaceClasses.length; i++) { ! Class<?> interfaceClass = interfaceClasses[i]; if ((event.getNewState() == ServiceState.RUNNING) *************** *** 249,257 **** private ServiceState _currentState = ServiceState.STOPPED; ! private ArrayList _waitDeps = new ArrayList(); ! private ArrayList _goodDeps = new ArrayList(); private class DependencyStateChangedListener implements IEventBusListener { public void processEvent(EventObject eventObject) { --- 249,259 ---- private ServiceState _currentState = ServiceState.STOPPED; ! private ArrayList<Class<?>> _waitDeps = new ArrayList<Class<?>>(); ! private ArrayList<Class<?>> _goodDeps = new ArrayList<Class<?>>(); private class DependencyStateChangedListener implements IEventBusListener { + private static final long serialVersionUID = 1L; + public void processEvent(EventObject eventObject) { |
|
From: Bavo De R. <ba...@us...> - 2010-08-07 11:07:06
|
Update of /cvsroot/pfc/pfc-rt/src/java/portal/rt/services/resource In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv11634/src/java/portal/rt/services/resource Modified Files: FileResourceLoader.java ResourceServiceConfigurator.java ResourceServiceController.java ClasspathResource.java FileResource.java ResourceServiceImpl.java ClasspathResourceLoader.java Log Message: Refactored to support generics. Added a default serialization id for all serializable classes. Index: FileResourceLoader.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/services/resource/FileResourceLoader.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FileResourceLoader.java 13 Sep 2005 11:28:01 -0000 1.1 --- FileResourceLoader.java 7 Aug 2010 11:06:58 -0000 1.2 *************** *** 34,37 **** --- 34,39 ---- public class FileResourceLoader implements IResourceLoader { + private static final long serialVersionUID = 1L; + private static final Log LOGGER = LogFactory.getLog(FileResourceLoader.class); Index: FileResource.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/services/resource/FileResource.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FileResource.java 13 Sep 2005 11:28:01 -0000 1.1 --- FileResource.java 7 Aug 2010 11:06:58 -0000 1.2 *************** *** 32,35 **** --- 32,37 ---- public class FileResource implements IResource { + private static final long serialVersionUID = 1L; + public FileResource(FileResourceLoader myResourceLoader, String resourcePath, String contentType) Index: ResourceServiceConfigurator.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/services/resource/ResourceServiceConfigurator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ResourceServiceConfigurator.java 13 Sep 2005 11:28:01 -0000 1.1 --- ResourceServiceConfigurator.java 7 Aug 2010 11:06:58 -0000 1.2 *************** *** 53,56 **** --- 53,58 ---- SAXReader reader = new SAXReader(); + LOGGER.info("Stream for config file is " + stream); + document = reader.read(stream); } *************** *** 69,73 **** Element root = document.getRootElement(); ! for (Iterator i = root.elementIterator("resource"); i.hasNext();) { Element resourceElement = (Element) i.next(); --- 71,75 ---- Element root = document.getRootElement(); ! for (Iterator<?> i = root.elementIterator("resource"); i.hasNext();) { Element resourceElement = (Element) i.next(); *************** *** 84,88 **** Properties properties = new Properties(); ! for (Iterator i = resourceElement.elementIterator("property"); i.hasNext();) { Element propertyElement = (Element) i.next(); --- 86,90 ---- Properties properties = new Properties(); ! for (Iterator<?> i = resourceElement.elementIterator("property"); i.hasNext();) { Element propertyElement = (Element) i.next(); *************** *** 107,111 **** try { ! Class resourceLoaderClass = resolveClass(classname); resourceLoader = (IResourceLoader) resourceLoaderClass.newInstance(); --- 109,113 ---- try { ! Class<?> resourceLoaderClass = resolveClass(classname); resourceLoader = (IResourceLoader) resourceLoaderClass.newInstance(); *************** *** 136,140 **** buffer.append("{Properties "); ! Iterator keyIt = properties.keySet().iterator(); while (keyIt.hasNext()) { --- 138,142 ---- buffer.append("{Properties "); ! Iterator<Object> keyIt = properties.keySet().iterator(); while (keyIt.hasNext()) { *************** *** 150,154 **** } ! private Class resolveClass(String className) throws ResourceServiceException { --- 152,156 ---- } ! private Class<?> resolveClass(String className) throws ResourceServiceException { Index: ClasspathResource.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/services/resource/ClasspathResource.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ClasspathResource.java 15 Feb 2006 20:47:04 -0000 1.2 --- ClasspathResource.java 7 Aug 2010 11:06:58 -0000 1.3 *************** *** 30,33 **** --- 30,35 ---- public class ClasspathResource implements IResource { + private static final long serialVersionUID = 1L; + public ClasspathResource(ClasspathResourceLoader myResourceLoader, String resourcePath, String contentType) Index: ClasspathResourceLoader.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/services/resource/ClasspathResourceLoader.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ClasspathResourceLoader.java 13 Sep 2005 11:28:01 -0000 1.1 --- ClasspathResourceLoader.java 7 Aug 2010 11:06:58 -0000 1.2 *************** *** 30,33 **** --- 30,35 ---- public class ClasspathResourceLoader implements IResourceLoader { + private static final long serialVersionUID = 1L; + public ClasspathResourceLoader() { Index: ResourceServiceController.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/services/resource/ResourceServiceController.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ResourceServiceController.java 13 Sep 2005 11:28:01 -0000 1.1 --- ResourceServiceController.java 7 Aug 2010 11:06:58 -0000 1.2 *************** *** 43,47 **** _resourceService = new ResourceServiceImpl(); ! InputStream stream = serviceConfig.getResourceAsStream("WEB-INF/services/resources/resources.xml"); ResourceServiceConfigurator configurator = new ResourceServiceConfigurator(); --- 43,47 ---- _resourceService = new ResourceServiceImpl(); ! InputStream stream = serviceConfig.getResourceAsStream("/WEB-INF/services/resources/resources.xml"); ResourceServiceConfigurator configurator = new ResourceServiceConfigurator(); Index: ResourceServiceImpl.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/services/resource/ResourceServiceImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ResourceServiceImpl.java 13 Sep 2005 11:28:01 -0000 1.1 --- ResourceServiceImpl.java 7 Aug 2010 11:06:58 -0000 1.2 *************** *** 24,27 **** --- 24,28 ---- import java.util.ArrayList; + import java.util.List; import org.apache.commons.logging.Log; *************** *** 38,42 **** public ResourceServiceImpl() throws ResourceServiceException { ! _resourceLoaders = new ArrayList(); } --- 39,43 ---- public ResourceServiceImpl() throws ResourceServiceException { ! _resourceLoaders = new ArrayList<IResourceLoader>(); } *************** *** 51,55 **** for (int i = 0; i != _resourceLoaders.size(); i++) { ! IResourceLoader resourceLoader = (IResourceLoader) _resourceLoaders.get(i); LOGGER.debug("Checking loader " + resourceLoader); --- 52,56 ---- for (int i = 0; i != _resourceLoaders.size(); i++) { ! IResourceLoader resourceLoader = _resourceLoaders.get(i); LOGGER.debug("Checking loader " + resourceLoader); *************** *** 69,73 **** for (int i = 0; i != _resourceLoaders.size(); i++) { ! IResourceLoader resourceLoader = (IResourceLoader) _resourceLoaders.get(i); if (resourceLoader.hasResource(resourcePath)) --- 70,74 ---- for (int i = 0; i != _resourceLoaders.size(); i++) { ! IResourceLoader resourceLoader = _resourceLoaders.get(i); if (resourceLoader.hasResource(resourcePath)) *************** *** 80,83 **** } ! private ArrayList _resourceLoaders; } \ No newline at end of file --- 81,84 ---- } ! private List<IResourceLoader> _resourceLoaders; } \ No newline at end of file |
|
From: Bavo De R. <ba...@us...> - 2010-08-07 11:07:06
|
Update of /cvsroot/pfc/pfc-rt/src/java/portal/rt/dojo In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv11634/src/java/portal/rt/dojo Modified Files: DojoExtention.java Log Message: Refactored to support generics. Added a default serialization id for all serializable classes. Index: DojoExtention.java =================================================================== RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/dojo/DojoExtention.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DojoExtention.java 3 Sep 2006 20:58:52 -0000 1.1 --- DojoExtention.java 7 Aug 2010 11:06:58 -0000 1.2 *************** *** 7,10 **** --- 7,11 ---- import java.util.Iterator; import java.util.LinkedList; + import java.util.List; import javax.servlet.http.HttpServletResponse; *************** *** 16,20 **** public DojoExtention() { ! _requiredWidgets = new LinkedList(); } --- 17,21 ---- public DojoExtention() { ! _requiredWidgets = new LinkedList<String>(); } *************** *** 26,33 **** public void requireWidget(String pWidgetName) { ! Iterator it = _requiredWidgets.iterator(); while (it.hasNext()) { ! String requiredWidget = (String) it.next(); if (requiredWidget.equals(pWidgetName)) --- 27,34 ---- public void requireWidget(String pWidgetName) { ! Iterator<String> it = _requiredWidgets.iterator(); while (it.hasNext()) { ! String requiredWidget = it.next(); if (requiredWidget.equals(pWidgetName)) *************** *** 52,59 **** writer.println("<script type=\"text/javascript\">"); ! Iterator it = _requiredWidgets.iterator(); while (it.hasNext()) { ! String requiredWidget = (String) it.next(); writer.println("dojo.require(\"" + requiredWidget + "\");"); --- 53,60 ---- writer.println("<script type=\"text/javascript\">"); ! Iterator<String> it = _requiredWidgets.iterator(); while (it.hasNext()) { ! String requiredWidget = it.next(); writer.println("dojo.require(\"" + requiredWidget + "\");"); *************** *** 67,70 **** } ! private LinkedList _requiredWidgets; } --- 68,71 ---- } ! private List<String> _requiredWidgets; } |
