Changeset 909
- Timestamp:
- 10/17/06 22:21:33 (2 years ago)
- Files:
-
- trunk/source/org/kolaka/freecast/config/DefaultConfigurationLoader.java (modified) (1 diff)
- trunk/source/org/kolaka/freecast/config/UserConfiguration.java (modified) (1 diff)
- trunk/source/org/kolaka/freecast/setup/Main.java (modified) (5 diffs)
- trunk/source/org/kolaka/freecast/setup/ReceiverTypeStep.java (modified) (1 diff)
- trunk/source/org/kolaka/freecast/setup/ReceiverWizardModel.java (modified) (1 diff)
- trunk/source/org/kolaka/freecast/transport/receiver/ReceiverConfigurationLoader.java (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/source/org/kolaka/freecast/config/DefaultConfigurationLoader.java
r908 r909 137 137 public UserConfiguration getUserConfiguration() { 138 138 return new UserConfiguration() { 139 public Configuration getConfiguration() {139 public HierarchicalConfiguration getConfiguration() { 140 140 return userConfiguration; 141 141 } trunk/source/org/kolaka/freecast/config/UserConfiguration.java
r908 r909 24 24 package org.kolaka.freecast.config; 25 25 26 import org.apache.commons.configuration.Configuration;27 26 import org.apache.commons.configuration.ConfigurationException; 27 import org.apache.commons.configuration.HierarchicalConfiguration; 28 28 29 29 public interface UserConfiguration { 30 30 31 Configuration getConfiguration();31 HierarchicalConfiguration getConfiguration(); 32 32 33 33 void save() throws ConfigurationException; trunk/source/org/kolaka/freecast/setup/Main.java
r908 r909 25 25 26 26 import org.apache.commons.configuration.ConfigurationException; 27 import org.apache.commons.configuration.DataConfiguration; 27 28 import org.apache.commons.configuration.HierarchicalConfiguration; 28 29 import org.apache.commons.logging.LogFactory; … … 32 33 import org.kolaka.freecast.swing.Resources; 33 34 import org.kolaka.freecast.swing.SwingApplication; 35 import org.kolaka.freecast.transport.receiver.ReceiverConfiguration; 34 36 import org.kolaka.freecast.transport.receiver.ReceiverConfigurationLoader; 37 import org.kolaka.freecast.transport.receiver.SourceReceiverConfiguration; 35 38 import org.kolaka.freecast.transport.receiver.TestReceiverConfiguration; 36 39 import org.pietschy.wizard.Wizard; … … 40 43 public class Main extends SwingApplication { 41 44 45 private SourceReceiverConfiguration receiverConfiguration; 46 private final ReceiverConfigurationLoader receiverConfigurationLoader = new ReceiverConfigurationLoader(); 47 42 48 public Main() { 43 49 super("setup"); … … 46 52 protected void postInit(HierarchicalConfiguration configuration) throws Exception { 47 53 super.postInit(configuration); 54 receiverConfiguration = loadReceiverConfiguration(configuration); 55 48 56 Resources resources = new ConfigurableResources(Configurations.subset(configuration, "gui.setup")); 57 } 58 59 private SourceReceiverConfiguration loadReceiverConfiguration(HierarchicalConfiguration configuration) throws ConfigurationException { 60 HierarchicalConfiguration receiverConfiguration = Configurations.subset(configuration, "node.receiver"); 61 TestReceiverConfiguration defaultBean = new TestReceiverConfiguration(); 62 63 if (receiverConfiguration.isEmpty()) { 64 return defaultBean; 65 } 66 67 ReceiverConfiguration receiverConfigurationBean = receiverConfigurationLoader.load(new DataConfiguration(receiverConfiguration)); 68 if (!(receiverConfigurationBean instanceof SourceReceiverConfiguration)) { 69 LogFactory.getLog(getClass()).warn("configured receiver isn't supported : " + receiverConfigurationBean); 70 return defaultBean; 71 } 72 73 return (SourceReceiverConfiguration) receiverConfigurationBean; 49 74 } 50 75 51 76 protected void run() throws Exception { 52 77 final ReceiverWizardModel model = new ReceiverWizardModel(); 53 model.setReceiverConfiguration( new TestReceiverConfiguration());78 model.setReceiverConfiguration(receiverConfiguration); 54 79 55 80 Wizard wizard = new Wizard(model); … … 63 88 // System.out.println(model.getConfiguration()); 64 89 UserConfiguration userConfiguration = getUserConfiguration(); 65 new ReceiverConfigurationLoader().save(model.getConfiguration(), userConfiguration.getConfiguration());90 receiverConfigurationLoader.save(model.getConfiguration(), userConfiguration.getConfiguration()); 66 91 67 92 try { trunk/source/org/kolaka/freecast/setup/ReceiverTypeStep.java
r883 r909 93 93 } 94 94 button.setSelected(true); 95 button.requestFocus(); 95 96 } 96 97 trunk/source/org/kolaka/freecast/setup/ReceiverWizardModel.java
r892 r909 114 114 115 115 Class configurationClass = (Class) CONFIGURATIONS.get(type); 116 try { 117 this.configuration = (SourceReceiverConfiguration) configurationClass.newInstance(); 118 } catch (Exception e) { 119 throw new InvalidStateException("Can't create configuration", e); 120 } 116 117 if (!configurationClass.isInstance(configuration)) 118 try { 119 this.configuration = (SourceReceiverConfiguration) configurationClass.newInstance(); 120 } catch (Exception e) { 121 throw new InvalidStateException("Can't create configuration", e); 122 } 121 123 122 124 LogFactory.getLog(getClass()).debug("change configuration for " + configuration); trunk/source/org/kolaka/freecast/transport/receiver/ReceiverConfigurationLoader.java
r908 r909 31 31 import org.apache.commons.configuration.ConfigurationException; 32 32 import org.apache.commons.configuration.DataConfiguration; 33 import org.apache.commons.configuration.HierarchicalConfiguration; 33 34 import org.apache.commons.logging.LogFactory; 34 35 import org.kolaka.freecast.config.Configurations; … … 60 61 * TODO subset(...).setProperty doesn't work for HierarchicalConfiguration 61 62 */ 62 public void save(ReceiverConfiguration configuration, Configuration receiverConfiguration) { 63 public void save(ReceiverConfiguration configuration, HierarchicalConfiguration receiverConfiguration) { 64 receiverConfiguration.clearTree(PREFIX); 65 63 66 if (configuration instanceof ShoutClientReceiverConfiguration) { 64 67 receiverConfiguration .setProperty(PREFIX + PROPERTY_CLASS, CLASS_SHOUTCLIENT);
