Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode: [3684] trunk/distr/src/apps/org/jnode/apps/jpartition
|
From: <fd...@us...> - 2008-01-05 08:50:18
|
Revision: 3684
http://jnode.svn.sourceforge.net/jnode/?rev=3684&view=rev
Author: fduminy
Date: 2008-01-05 00:50:17 -0800 (Sat, 05 Jan 2008)
Log Message:
-----------
build fix
Removed Paths:
-------------
trunk/distr/src/apps/org/jnode/apps/jpartition/controller/MainController.java
trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/DeviceView.java
trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/ErrorReporter.java
trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/MainView.java
Deleted: trunk/distr/src/apps/org/jnode/apps/jpartition/controller/MainController.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/controller/MainController.java 2008-01-04 17:38:02 UTC (rev 3683)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/controller/MainController.java 2008-01-05 08:50:17 UTC (rev 3684)
@@ -1,90 +0,0 @@
-package org.jnode.apps.jpartition.controller;
-
-import it.battlehorse.stamps.Dispatcher;
-import it.battlehorse.stamps.factories.DispatcherRegistry;
-import it.battlehorse.stamps.factories.TransformerRegistry;
-import org.jnode.apps.jpartition.ViewFactory;
-import org.jnode.apps.jpartition.model.CommandProcessorModel;
-import org.jnode.apps.jpartition.model.DeviceModel;
-import org.jnode.apps.jpartition.model.FileDeviceModel;
-
-public class MainController
-{
- final private DeviceModel deviceModel;
- final private FileDeviceModel fileDeviceModel;
- final private CommandProcessorModel cmdProcessorModel;
-
- public MainController(ViewFactory viewFactory) throws Exception
- {
- TransformerRegistry.getInstance().loadTransformers();
- Dispatcher dispatcher = DispatcherRegistry.getInstance().getBasicDispatcher();
-
- // FileDevice
- this.fileDeviceModel = new FileDeviceModel();
- Object fileDeviceView = viewFactory.createFileDeviceView(this);
-
- dispatcher.registerModel("FileDeviceModel",fileDeviceModel);
- dispatcher.registerView("FileDeviceModel",fileDeviceView,true);
-
- // CommandProcessor
- this.cmdProcessorModel = new CommandProcessorModel();
- Object cmdProcessorView = viewFactory.createCommandProcessorView(this);
-
- dispatcher.registerModel("CommandProcessorModel",cmdProcessorModel);
- dispatcher.registerView("CommandProcessorModel",cmdProcessorView,true);
-
- // Device
- this.deviceModel = new DeviceModel();
- Object deviceView = viewFactory.createDeviceView(this, fileDeviceView, cmdProcessorView);
-
- dispatcher.registerModel("DeviceModel",deviceModel);
- dispatcher.registerView("DeviceModel",deviceView,true);
- }
-
-/*
- final private DeviceModel model;
-
- public DeviceController(DeviceModel model)
- {
- this.model = model;
- }
-
-
- public static DeviceModel getDevicePartitions()
- {
- DeviceModel devParts = new DeviceModel();
- try {
- org.jnode.driver.DeviceManager devMan = org.jnode.driver.DeviceUtils.getDeviceManager();
- Collection<Device> devices = devMan.getDevicesByAPI(PartitionableBlockDeviceAPI.class);
- for(Device device : devices)
- {
- devParts.add(new DeviceModel((IDEDevice) device));
- }
- } catch (NameNotFoundException e) {
- log.error(e);
- }
- return devParts;
- }
-*/
-
-
- public void userAddFakeDisk() {
- fileDeviceModel.addFakeDisk();
- }
-
- public void userAddVMWareDisk() {
- fileDeviceModel.addVMWareDisk();
- }
-
- public void userRemoveFileDevice(Object device) {
- fileDeviceModel.removeFileDevice(device);
- }
-
- public void userProcessCommands() {
- cmdProcessorModel.processCommands();
- }
-
- public void userSelectDevice(Object device) {
- deviceModel.setDevice(device);
- }
-}
Deleted: trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/DeviceView.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/DeviceView.java 2008-01-04 17:38:02 UTC (rev 3683)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/DeviceView.java 2008-01-05 08:50:17 UTC (rev 3684)
@@ -1,93 +0,0 @@
-package org.jnode.apps.jpartition.swingview;
-
-import it.battlehorse.stamps.annotations.ModelDependent;
-import javax.swing.*;
-import org.apache.log4j.Logger;
-import org.jnode.apps.jpartition.controller.MainController;
-
-public class DeviceView extends JPanel
-{
- private static final Logger log = Logger.getLogger(DeviceView.class);
-
- final private MainController controller;
-
- //final private Object device;
-
- public DeviceView(MainController controller)
- {
- this.controller = controller;
- }
-
-/*
- private static final Logger log = Logger.getLogger(DevicePartitionsUI.class);
-
- final private DevicePartitionsList devicePartitions;
-
- final private DefaultComboBoxModel cboDevicesModel = new DefaultComboBoxModel();
- final private JComboBox cboDevices = new JComboBox(cboDevicesModel);
- final private JPanel partitionsPanel = new JPanel(new FlowLayout());
- final private PartitionController controller;
-
- public DevicePartitionsUI(DevicePartitionsList devicePartitions, PartitionController controller)
- {
- super(new BorderLayout());
-
- setBorder(BorderFactory.createTitledBorder(""));
-
- this.devicePartitions = devicePartitions;
- this.controller = controller;
-
- JPanel devPanel = new JPanel(new BorderLayout());
- devPanel.add(new JLabel("device : "), BorderLayout.WEST);
- devPanel.add(cboDevices, BorderLayout.CENTER);
- add(devPanel, BorderLayout.NORTH);
-
- add(partitionsPanel, BorderLayout.CENTER);
-
- for(DeviceModel devParts : devicePartitions)
- {
- cboDevicesModel.addElement(devParts);
- }
-
- if(cboDevicesModel.getSize() > 0)
- {
- cboDevices.setSelectedIndex(0);
- }
-
- cboDevices.addItemListener(new ItemListener()
- {
- public void itemStateChanged(ItemEvent event) {
- if(event.getStateChange() == ItemEvent.SELECTED)
- {
- log.debug("itemStateChanged");
- DeviceModel devParts = (DeviceModel) event.getItem();
- partitionsPanel.removeAll();
-
- if(devParts.getPartitions().isEmpty())
- {
- DiskAreaUI disk = new DiskAreaUI(DevicePartitionsUI.this.controller.getCommandProcessor(), devParts.getDevice());
- disk.setLabel("disk not partitioned");
- partitionsPanel.add(disk);
- }
- else
- {
- for(PartitionModel partition : devParts.getPartitions())
- {
- partitionsPanel.add(new PartitionUI(DevicePartitionsUI.this.controller.getCommandProcessor(), devParts.getDevice(), partition));
- }
- }
- }
- }
- });
- }
-
- public void deviceAdded(DeviceModel devParts) {
- log.debug("deviceAdded");
- cboDevicesModel.addElement(devParts);
- }
-
- public void deviceRemoved(DeviceModel devParts) {
- cboDevicesModel.removeElement(devParts);
- }
-*/
-}
Deleted: trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/ErrorReporter.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/ErrorReporter.java 2008-01-04 17:38:02 UTC (rev 3683)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/ErrorReporter.java 2008-01-05 08:50:17 UTC (rev 3684)
@@ -1,38 +0,0 @@
-package org.jnode.apps.jpartition.swingview;
-
-import charva.awt.Component;
-import charvax.swing.JOptionPane;
-import org.apache.log4j.Logger;
-
-public class ErrorReporter {
- public static void reportError(Logger log, Object source, Throwable t)
- {
- reportError(log, source, (Object) t);
- }
-
- public static void reportError(Logger log, Object source, String message)
- {
- reportError(log, source, (Object) message);
- }
-
- private static void reportError(Logger log, Object source, Object message)
- {
- Component parent = (source instanceof Component) ? (Component) source : null;
- Throwable t = (message instanceof Throwable) ? (Throwable) message : null;
-
- String msg = (t == null) ? String.valueOf(message) : t.getMessage();
- JOptionPane.showMessageDialog(parent,
- "an error happened : "+msg+"\nSee logs for details",
- "error",
- JOptionPane.ERROR_MESSAGE);
-
- if(t != null)
- {
- log.error(msg, t);
- }
- else
- {
- log.error(msg);
- }
- }
-}
Deleted: trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/MainView.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/MainView.java 2008-01-04 17:38:02 UTC (rev 3683)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/swingview/MainView.java 2008-01-05 08:50:17 UTC (rev 3684)
@@ -1,70 +0,0 @@
-package org.jnode.apps.jpartition.swingview;
-
-import it.battlehorse.stamps.annotations.ModelDependent;
-import java.awt.*;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import javax.swing.*;
-import org.apache.log4j.Logger;
-import org.jnode.apps.jpartition.controller.MainController;
-
-public class MainView extends JFrame {
- private static final Logger log = Logger.getLogger(DeviceView.class);
-
- final private MainController controller;
- final private DefaultComboBoxModel devices;
- final private DeviceView deviceView;
-
- public MainView(MainController controller,
- JFrame fileDeviceView,
- JComponent cmdProcessorView) throws Exception
- {
- this.controller = controller;
-
- setTitle("JPartition");
- setLayout(new BorderLayout());
- setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-
- add(cmdProcessorView, BorderLayout.SOUTH);
-
- deviceView = new DeviceView(controller);
- add(deviceView, BorderLayout.CENTER);
-
- devices = new DefaultComboBoxModel();
- JComboBox cboDevices = new JComboBox(devices);
- cboDevices.addItemListener(new ItemListener()
- {
- public void itemStateChanged(ItemEvent event) {
- boolean selected = (event.getStateChange() == ItemEvent.SELECTED);
- if(selected)
- {
- MainView.this.controller.userSelectDevice(event.getItem());
- }
- }
- });
- add(cboDevices, BorderLayout.NORTH);
-
- setSize(600, 300);
- setVisible(true);
- setLocation(fileDeviceView.getX(), fileDeviceView.getY() + fileDeviceView.getHeight());
- }
-
- @ModelDependent(modelKey ="DeviceModel" , propertyKey = "deviceStarted")
- public void deviceStarted(Object device) {
- log.debug("deviceStarted");
- devices.addElement(device);
- }
-
- @ModelDependent(modelKey ="DeviceModel" , propertyKey = "deviceStop")
- public void deviceStop(Object device) {
- log.debug("deviceStop");
- devices.removeElement(device);
- }
-
- @ModelDependent(modelKey ="DeviceModel" , propertyKey = "deviceSelected")
- public void deviceSelected(Object device) {
- log.debug("deviceSelected");
- //TODO
- //deviceView.init(device);
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
