diff --git a/src/controller/channel/NameConfigurationEditor.java b/src/controller/channel/NameConfigurationEditor.java
index e0525bdf..fc8961de 100644
--- a/src/controller/channel/NameConfigurationEditor.java
+++ b/src/controller/channel/NameConfigurationEditor.java
@@ -1,269 +1,267 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014-2016 Dennis Sheirer
- *
+ *
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program. If not, see
******************************************************************************/
package controller.channel;
+import alias.AliasModel;
import gui.editor.Editor;
+import net.miginfocom.swing.MigLayout;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Collections;
import java.util.List;
-import javax.swing.ComboBoxModel;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JTextField;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import net.miginfocom.swing.MigLayout;
-import alias.AliasModel;
-
public class NameConfigurationEditor extends Editor implements DocumentListener
{
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- private final static Logger mLog = LoggerFactory.getLogger( NameConfigurationEditor.class );
+ private final static Logger mLog = LoggerFactory.getLogger(NameConfigurationEditor.class);
- private static ComboBoxModel EMPTY_MODEL = new DefaultComboBoxModel<>();
+ private static ComboBoxModel EMPTY_SYSTEM_MODEL = new DefaultComboBoxModel<>();
+ private static ComboBoxModel EMPTY_SITE_MODEL = new DefaultComboBoxModel<>();
+ private static ComboBoxModel EMPTY_ALIAS_LIST_MODEL = new DefaultComboBoxModel<>();
- private AliasModel mAliasModel;
- private ChannelModel mChannelModel;
-
- private JTextField mChannelName;
- private JComboBox mSystemNameCombo;
- private JComboBox mSiteNameCombo;
- private JComboBox mAliasListCombo;
-
- public NameConfigurationEditor( AliasModel aliasModel, ChannelModel model )
- {
- mAliasModel = aliasModel;
- mChannelModel = model;
+ private AliasModel mAliasModel;
+ private ChannelModel mChannelModel;
- init();
- }
-
- private void init()
- {
- setLayout( new MigLayout( "fill,wrap 4", "[right][grow,fill][right][grow,fill]", "[][][grow]" ) );
+ private JTextField mChannelName;
+ private JComboBox mSystemNameCombo;
+ private JComboBox mSiteNameCombo;
+ private JComboBox mAliasListCombo;
- mChannelName = new JTextField( "" );
- mChannelName.getDocument().addDocumentListener( this );
- mChannelName.setEnabled( false );
+ public NameConfigurationEditor(AliasModel aliasModel, ChannelModel model)
+ {
+ mAliasModel = aliasModel;
+ mChannelModel = model;
- add( new JLabel( "Name:" ) );
- add( mChannelName );
+ init();
+ }
- mSystemNameCombo = new JComboBox<>( EMPTY_MODEL );
- mSystemNameCombo.setEnabled( false );
- mSystemNameCombo.setEditable( true );
- mSystemNameCombo.addActionListener( new ActionListener()
- {
- @Override
- public void actionPerformed( ActionEvent e )
- {
- Object selected = mSystemNameCombo.getSelectedItem();
-
- if( selected != null )
- {
- String system = (String)selected;
-
- List sites = mChannelModel.getSites( system );
+ private void init()
+ {
+ setLayout(new MigLayout("fill,wrap 4", "[right][grow,fill][right][grow,fill]", "[][][grow]"));
- if( !sites.contains( getItem().getSite() ) )
- {
- sites.add( getItem().getSite() );
- }
-
- if( sites.isEmpty() )
- {
- mSiteNameCombo.setModel( EMPTY_MODEL );
- }
- else
- {
- mSiteNameCombo.setModel( new DefaultComboBoxModel(
- sites.toArray( new String[ sites.size() ] ) ) );;
- }
-
- mSiteNameCombo.setSelectedItem( getItem().getSite() );
- }
-
- setModified( true );
- }
- } );
-
- add( new JLabel( "System:" ) );
- add( mSystemNameCombo );
+ mChannelName = new JTextField("");
+ mChannelName.getDocument().addDocumentListener(this);
+ mChannelName.setEnabled(false);
- mAliasListCombo = new JComboBox();
- mAliasListCombo.setEnabled( false );
- mAliasListCombo.setEditable( true );
- mAliasListCombo.addActionListener( new ActionListener()
- {
- @Override
- public void actionPerformed( ActionEvent e )
- {
- setModified( true );
- }
- } );
-
- add( new JLabel( "Alias List:" ) );
- add( mAliasListCombo );
-
- mSiteNameCombo = new JComboBox<>( EMPTY_MODEL );
- mSiteNameCombo.setEnabled( false );
- mSiteNameCombo.setEditable( true );
- mSiteNameCombo.addActionListener( new ActionListener()
- {
- @Override
- public void actionPerformed( ActionEvent e )
- {
- setModified( true );
- }
- } );
-
- add( new JLabel( "Site:" ) );
- add( mSiteNameCombo );
- }
-
- @Override
- public void save()
- {
- if( hasItem() && isModified() )
- {
- getItem().setName( mChannelName.getText() );
-
- Object system = mSystemNameCombo.getSelectedItem();
- getItem().setSystem( ( system == null ? null : (String)system ) );
+ add(new JLabel("Name:"));
+ add(mChannelName);
- Object site = mSiteNameCombo.getSelectedItem();
- getItem().setSite( ( site == null ? null : (String)site ) );
+ mSystemNameCombo = new JComboBox<>(EMPTY_SYSTEM_MODEL);
+ mSystemNameCombo.setEnabled(false);
+ mSystemNameCombo.setEditable(true);
+ mSystemNameCombo.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ Object selected = mSystemNameCombo.getSelectedItem();
- Object aliasList = mAliasListCombo.getSelectedItem();
- getItem().setAliasListName( aliasList == null ? null : (String)aliasList );
- }
-
- setModified( false );
- }
+ if(selected != null)
+ {
+ String system = (String)selected;
- private void setControlsEnabled( boolean enabled )
- {
- if( mChannelName.isEnabled() != enabled )
- {
- mChannelName.setEnabled( enabled );
- }
+ List sites = mChannelModel.getSites(system);
- if( mAliasListCombo.isEnabled() != enabled )
- {
- mAliasListCombo.setEnabled( enabled );
- }
+ if(!sites.contains(getItem().getSite()))
+ {
+ sites.add(getItem().getSite());
+ }
- if( mSystemNameCombo.isEnabled() != enabled )
- {
- mSystemNameCombo.setEnabled( enabled );
- }
-
- if( mSiteNameCombo.isEnabled() != enabled )
- {
- mSiteNameCombo.setEnabled( enabled );
- }
- }
+ if(sites.isEmpty())
+ {
+ mSiteNameCombo.setModel(EMPTY_SITE_MODEL);
+ }
+ else
+ {
+ mSiteNameCombo.setModel(new DefaultComboBoxModel(
+ sites.toArray(new String[sites.size()])));
+ ;
+ }
- @Override
- public void setItem( Channel channel )
- {
- super.setItem( channel );
-
- if( hasItem() )
- {
- setControlsEnabled( true );
-
- mChannelName.setText( channel.getName() );
+ mSiteNameCombo.setSelectedItem(getItem().getSite());
+ }
- List systems = mChannelModel.getSystems();
-
- if( systems.isEmpty() )
- {
- mSystemNameCombo.setModel( EMPTY_MODEL );
- }
- else
- {
- mSystemNameCombo.setModel( new DefaultComboBoxModel(
- systems.toArray( new String[ systems.size() ] ) ) );;
- }
-
- mSystemNameCombo.setSelectedItem( channel.getSystem() );
+ setModified(true);
+ }
+ });
- List sites = mChannelModel.getSites( channel.getSystem() );
+ add(new JLabel("System:"));
+ add(mSystemNameCombo);
- if( sites.isEmpty() )
- {
- mSiteNameCombo.setModel( EMPTY_MODEL );
- }
- else
- {
- mSiteNameCombo.setModel( new DefaultComboBoxModel(
- sites.toArray( new String[ sites.size() ] ) ) );;
- }
+ mAliasListCombo = new JComboBox(EMPTY_ALIAS_LIST_MODEL);
+ mAliasListCombo.setEnabled(false);
+ mAliasListCombo.setEditable(true);
+ mAliasListCombo.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ setModified(true);
+ }
+ });
- if( channel.getSite() != null )
- {
- mSiteNameCombo.setSelectedItem( channel.getSite() );
- }
-
- List lists = mAliasModel.getListNames();
- Collections.sort( lists );
- mAliasListCombo.setModel( new DefaultComboBoxModel(
- lists.toArray( new String[ lists.size() ] ) ) );
-
- if( channel.getAliasListName() != null )
- {
- mAliasListCombo.setSelectedItem( channel.getAliasListName() );
- }
- }
- else
- {
- setControlsEnabled( false );
- mChannelName.setText( null );
- }
-
- setModified( false );
- }
+ add(new JLabel("Alias List:"));
+ add(mAliasListCombo);
- @Override
- public void insertUpdate( DocumentEvent e )
- {
- setModified( true );
- }
+ mSiteNameCombo = new JComboBox<>(EMPTY_SITE_MODEL);
+ mSiteNameCombo.setEnabled(false);
+ mSiteNameCombo.setEditable(true);
+ mSiteNameCombo.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ setModified(true);
+ }
+ });
- @Override
- public void changedUpdate( DocumentEvent e )
- {
- setModified( true );
- }
-
- @Override
- public void removeUpdate( DocumentEvent e )
- {
- setModified( true );
- }
+ add(new JLabel("Site:"));
+ add(mSiteNameCombo);
+ }
+
+ @Override
+ public void save()
+ {
+ if(hasItem() && isModified())
+ {
+ getItem().setName(mChannelName.getText());
+
+ Object system = mSystemNameCombo.getSelectedItem();
+ getItem().setSystem((system == null ? null : (String)system));
+
+ Object site = mSiteNameCombo.getSelectedItem();
+ getItem().setSite((site == null ? null : (String)site));
+
+ Object aliasList = mAliasListCombo.getSelectedItem();
+ getItem().setAliasListName(aliasList == null ? null : (String)aliasList);
+ }
+
+ setModified(false);
+ }
+
+ private void setControlsEnabled(boolean enabled)
+ {
+ if(mChannelName.isEnabled() != enabled)
+ {
+ mChannelName.setEnabled(enabled);
+ }
+
+ if(mAliasListCombo.isEnabled() != enabled)
+ {
+ mAliasListCombo.setEnabled(enabled);
+ }
+
+ if(mSystemNameCombo.isEnabled() != enabled)
+ {
+ mSystemNameCombo.setEnabled(enabled);
+ }
+
+ if(mSiteNameCombo.isEnabled() != enabled)
+ {
+ mSiteNameCombo.setEnabled(enabled);
+ }
+ }
+
+ @Override
+ public void setItem(Channel channel)
+ {
+ super.setItem(channel);
+
+ if(hasItem())
+ {
+ setControlsEnabled(true);
+
+ mChannelName.setText(channel.getName());
+
+ List systems = mChannelModel.getSystems();
+
+ if(systems.isEmpty())
+ {
+ mSystemNameCombo.setModel(EMPTY_SYSTEM_MODEL);
+ }
+ else
+ {
+ mSystemNameCombo.setModel(new DefaultComboBoxModel(
+ systems.toArray(new String[systems.size()])));
+ ;
+ }
+
+ mSystemNameCombo.setSelectedItem(channel.getSystem());
+
+ List sites = mChannelModel.getSites(channel.getSystem());
+
+ if(sites.isEmpty())
+ {
+ mSiteNameCombo.setModel(EMPTY_SITE_MODEL);
+ }
+ else
+ {
+ mSiteNameCombo.setModel(new DefaultComboBoxModel(
+ sites.toArray(new String[sites.size()])));
+ ;
+ }
+
+ if(channel.getSite() != null)
+ {
+ mSiteNameCombo.setSelectedItem(channel.getSite());
+ }
+
+ List lists = mAliasModel.getListNames();
+ Collections.sort(lists);
+ mAliasListCombo.setModel(new DefaultComboBoxModel(
+ lists.toArray(new String[lists.size()])));
+
+ if(channel.getAliasListName() != null)
+ {
+ mAliasListCombo.setSelectedItem(channel.getAliasListName());
+ }
+ }
+ else
+ {
+ setControlsEnabled(false);
+ mChannelName.setText(null);
+ }
+
+ setModified(false);
+ }
+
+ @Override
+ public void insertUpdate(DocumentEvent e)
+ {
+ setModified(true);
+ }
+
+ @Override
+ public void changedUpdate(DocumentEvent e)
+ {
+ setModified(true);
+ }
+
+ @Override
+ public void removeUpdate(DocumentEvent e)
+ {
+ setModified(true);
+ }
}