Ignore:
Timestamp:
2012-02-18T18:03:10+01:00 (13 years ago)
Author:
bastik
Message:

update because of core api change: 2nd part (preferences - rev. 4968)

Location:
applications/editors/josm/plugins/imagery-xml-bounds
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/imagery-xml-bounds/build.xml

    r27015 r27863  
    3232    <property name="commit.message" value="Commit message"/>
    3333    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    34     <property name="plugin.main.version" value="4577"/>
     34    <property name="plugin.main.version" value="4987"/>
    3535    <!-- should not be necessary to change the following properties -->
    3636    <property name="josm" location="../../core/dist/josm-custom.jar"/>
    … …  
    150150    </target>
    151151    <!--
    152     ************************** Publishing the plugin *********************************** 
    153     -->
    154     <!--
    155     ** extracts the JOSM release for the JOSM version in ../core and saves it in the 
     152    ************************** Publishing the plugin ***********************************
     153    -->
     154    <!--
     155    ** extracts the JOSM release for the JOSM version in ../core and saves it in the
    156156    ** property ${coreversion.info.entry.revision}
    157157    -->
    … …  
    197197        <echo>
    198198    ***** Properties of published ${plugin.jar} *****
    199     Commit message    : '${commit.message}'                   
     199    Commit message    : '${commit.message}'
    200200    Plugin-Mainversion: ${plugin.main.version}
    201201    JOSM build version: ${coreversion.info.entry.revision}
    202202    Plugin-Version    : ${version.entry.commit.revision}
    203     ***** / Properties of published ${plugin.jar} *****                   
    204                        
     203    ***** / Properties of published ${plugin.jar} *****
     204
    205205    Now commiting ${plugin.jar} ...
    206206    </echo>

  • applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/XmlBoundsPreferenceSetting.java

    r27015 r27863  
    1818import javax.swing.JButton;
    1919
    20 import org.openstreetmap.josm.gui.preferences.ImageryPreference;
    21 import org.openstreetmap.josm.gui.preferences.ImageryPreference.ImageryProvidersPanel;
    22 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
     20import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference;
     21import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference.ImageryProvidersPanel;
     22import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
     23import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
    2324import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
    2425import org.openstreetmap.josm.plugins.imageryxmlbounds.actions.EditEntriesAction;
    2526
    2627/**
    27  * 
     28 *
    2829 * @author Don-vip
    2930 *
    3031 */
    31 public class XmlBoundsPreferenceSetting implements PreferenceSetting {
     32public class XmlBoundsPreferenceSetting implements SubPreferenceSetting {
    3233
    33         @Override
    34         public void addGui(PreferenceTabbedPane gui) {
    35                 for (PreferenceSetting ps : gui.getSettings()) {
    36                         if (ps instanceof ImageryPreference) {
    37                                 ImageryProvidersPanel ipp = ((ImageryPreference) ps).getProvidersPanel();
    38                                 EditEntriesAction action = new EditEntriesAction(ipp.defaultTable, ipp.defaultModel);
    39                                 ipp.middleToolbar.add(new JButton(action));
    40                                 // TODO
    41                                 break;
    42                         }
    43                 }
    44         }
     34    @Override
     35    public void addGui(PreferenceTabbedPane gui) {
     36        ImageryProvidersPanel ipp = gui.getImageryPreference().getProvidersPanel();
     37        EditEntriesAction action = new EditEntriesAction(ipp.defaultTable, ipp.defaultModel);
     38        ipp.middleToolbar.add(new JButton(action));
     39    }
    4540
    46         @Override
    47         public boolean ok() {
    48                 return false;
    49         }
     41    @Override
     42    public boolean ok() {
     43        return false;
     44    }
     45
     46    @Override
     47    public boolean isExpert() {
     48        return false;
     49    }
     50
     51    public TabPreferenceSetting getTabPreferenceSetting(final PreferenceTabbedPane gui) {
     52        return gui.getImageryPreference();
     53    }
     54
    5055}

  • applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/EditEntriesAction.java

    r27015 r27863  
    3030import org.openstreetmap.josm.actions.JosmAction;
    3131import org.openstreetmap.josm.data.imagery.ImageryInfo;
    32 import org.openstreetmap.josm.gui.preferences.ImageryPreference.ImageryProvidersPanel.ImageryDefaultLayerTableModel;
     32import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference.ImageryProvidersPanel.ImageryDefaultLayerTableModel;
    3333import org.openstreetmap.josm.plugins.imageryxmlbounds.XmlBoundsConstants;
    3434import org.openstreetmap.josm.plugins.imageryxmlbounds.XmlBoundsLayer;
    … …  
    3939
    4040        protected static final String ACTION_NAME = tr("Edit");
    41        
     41
    4242        private final JTable defaultTable;
    4343        private final ImageryDefaultLayerTableModel defaultModel;
    44        
     44
    4545        private final List<ImageryInfo> entries;
    46        
     46
    4747        public EditEntriesAction(JTable defaultTable, ImageryDefaultLayerTableModel defaultModel) {
    4848        putValue(SHORT_DESCRIPTION, tr("edit bounds for selected defaults"));
    … …  
    5959        setEnabled(false);
    6060        }
    61        
     61
    6262        @Override
    6363        public void actionPerformed(ActionEvent e) {
    … …  
    8383                        entries.clear();
    8484                        for (int row : defaultTable.getSelectedRows()) {
    85                                 ImageryInfo info = defaultModel.getRow(row); 
     85                                ImageryInfo info = defaultModel.getRow(row);
    8686                                if (info != null && info.getBounds() != null) {
    8787                                        entries.add(info);
Note: See TracChangeset for help on using the changeset viewer.