Ticket #2957: unchecked.patch

File unchecked.patch, 8.6 KB (added by plaicy, 17 years ago)

  • src/org/openstreetmap/josm/actions/CombineWayAction.java

     
    5555        DataSet.selListeners.add(this);
    5656    }
    5757
     58    @SuppressWarnings("unchecked")
    5859    public void actionPerformed(ActionEvent event) {
    5960        Collection<OsmPrimitive> selection = Main.ds.getSelected();
    6061        LinkedList<Way> selectedWays = new LinkedList<Way>();

  • src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java

     
    188188     * @param table  the table
    189189     * @return the table model
    190190     */
     191    @SuppressWarnings("unchecked")
    191192    protected ListMergeModel<Node>.EntriesTableModel getModel(JTable table) {
    192193        return (ListMergeModel.EntriesTableModel)table.getModel();
    193194    }

  • src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberTableCellRenderer.java

     
    225225     * @param table  the table
    226226     * @return the table model
    227227     */
     228    @SuppressWarnings("unchecked")
    228229    protected ListMergeModel<Node>.EntriesTableModel getModel(JTable table) {
    229230        return (ListMergeModel.EntriesTableModel)table.getModel();
    230231    }

  • src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

     
    9797    // Add one Maker specifying the default behaviour.
    9898    static {
    9999        Marker.markerProducers.add(new MarkerProducers() {
     100            @SuppressWarnings("unchecked")
    100101            public Marker createMarker(WayPoint wpt, File relativePath, MarkerLayer parentLayer, double time, double offset) {
    101102                String uri = null;
    102103                // cheapest way to check whether "link" object exists and is a non-empty

  • src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

     
    6767    private static double audioAnimationInterval = 0.0; // seconds
    6868    private static double playheadTime = -1.0;
    6969     */
     70    @SuppressWarnings("unchecked")
    7071    public MarkerLayer(GpxData indata, String name, File associatedFile, GpxLayer fromLayer) {
    7172
    7273        super(name);

  • src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

     
    133133     * Edit the value in the properties table row
    134134     * @param row The row of the table from which the value is edited.
    135135     */
     136    @SuppressWarnings("unchecked")
    136137    void propertyEdit(int row) {
    137138        Collection<OsmPrimitive> sel = Main.ds.getSelected();
    138139        if (sel.isEmpty()) return;
    … …  
    303304     *
    304305     * @param row
    305306     */
     307    @SuppressWarnings("unchecked")
    306308    void membershipEdit(int row) {
    307309        Relation relation = (Relation)membershipData.getValueAt(row, 0);
    308310        Main.main.map.relationListDialog.selectRelation(relation);
    … …  
    477479        propertyTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
    478480
    479481        propertyTable.getColumnModel().getColumn(1).setCellRenderer(new DefaultTableCellRenderer(){
     482            @SuppressWarnings("unchecked")
    480483            @Override public Component getTableCellRendererComponent(JTable table, Object value,
    481484                    boolean isSelected, boolean hasFocus, int row, int column) {
    482485                Component c = super.getTableCellRendererComponent(table, value, isSelected, false, row, column);
    … …  
    520523        });
    521524
    522525        membershipTable.getColumnModel().getColumn(1).setCellRenderer(new DefaultTableCellRenderer() {
     526            @SuppressWarnings("unchecked")
    523527            @Override public Component getTableCellRendererComponent(JTable table, Object value,
    524528                    boolean isSelected, boolean hasFocus, int row, int column) {
    525529                Component c = super.getTableCellRendererComponent(table, value, isSelected, false, row, column);

  • src/org/openstreetmap/josm/gui/FileDrop.java

     
    323323                    // over the drag target.
    324324                }   // end dragOver
    325325
     326                @SuppressWarnings("unchecked")
    326327                public void drop( java.awt.dnd.DropTargetDropEvent evt )
    327328                {   log( out, "FileDrop: drop event." );
    328329                    try
    … …  
    467468     private static File[] createFileArray(BufferedReader bReader, PrintStream out)
    468469     {
    469470        try {
    470             java.util.List list = new java.util.ArrayList();
     471            java.util.List<File> list = new java.util.ArrayList<File>();
    471472            java.lang.String line = null;
    472473            while ((line = bReader.readLine()) != null) {
    473474                try {

  • src/org/openstreetmap/josm/io/GpxReader.java

     
    190190            }
    191191        }
    192192
     193        @SuppressWarnings("unchecked")
    193194        @Override public void endElement(String namespaceURI, String qName, String rqName) {
    194195            switch (currentState) {
    195196            case metadata:

  • src/org/openstreetmap/josm/io/GpxWriter.java

     
    5757        out.flush();
    5858    }
    5959
     60    @SuppressWarnings("unchecked")
    6061    private void writeAttr(Map<String, Object> attr) {
    6162        // FIXME this loop is evil, because it does not assure the
    6263        // correct element order specified by the xml schema.
    … …  
    7374        }
    7475    }
    7576
     77    @SuppressWarnings("unchecked")
    7678    private void writeMetaData() {
    7779        Map<String, Object> attr = data.attr;
    7880        openln("metadata");

  • src/org/openstreetmap/josm/data/conflict/Conflict.java

     
    5151    }
    5252
    5353    @Override
     54    @SuppressWarnings("unchecked")
    5455    public boolean equals(Object obj) {
    5556        if (this == obj)
    5657            return true;

  • src/org/openstreetmap/josm/data/gpx/GpxData.java

     
    3939    public Collection<GpxRoute> routes = new LinkedList<GpxRoute>();
    4040    public Collection<WayPoint> waypoints = new LinkedList<WayPoint>();
    4141
     42    @SuppressWarnings("unchecked")
    4243    public void mergeFrom(GpxData other) {
    4344        if (storageFile == null && other.storageFile != null) {
    4445            storageFile = other.storageFile;

  • build.xml

     
    6666                <javac srcdir="src" classpathref="classpath" destdir="build"
    6767                                target="1.5" source="1.5" debug="on" encoding="UTF-8">
    6868                        <compilerarg value="-Xlint:deprecation"/>
     69                        <compilerarg value="-Xlint:unchecked"/>
    6970                </javac>
    7071        </target>
    7172