Revision 1990 org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.swing/org.gvsig.tools.swing.impl/src/main/java/org/gvsig/tools/swing/impl/bookmarkshistory/DefaultBookmarksPanel.java

View differences:

DefaultBookmarksPanel.java
3 3
import java.awt.Dimension;
4 4
import java.awt.event.ActionEvent;
5 5
import java.awt.event.ActionListener;
6
import java.util.Date;
7 6
import javax.swing.DefaultListModel;
8 7
import javax.swing.event.ListSelectionEvent;
9 8
import javax.swing.event.ListSelectionListener;
10
import org.apache.commons.lang3.StringUtils;
11
import org.gvsig.tools.ToolsLocator;
12 9
import org.gvsig.tools.bookmarksandhistory.Bookmark;
13 10
import org.gvsig.tools.bookmarksandhistory.Bookmarks;
14 11

  
......
16 13

  
17 14
    private static final int STATE_VIEWING = 0;
18 15
    private static final int STATE_MODIFYING = 1;
19
    private Bookmarks bookmarks;
16
    private Bookmarks<T> bookmarks;
20 17

  
21 18
    private static class BookmarkListModel extends DefaultListModel<Bookmark> {
22 19

  
......
27 24
    }
28 25

  
29 26
    private int state;
30
    private Bookmark currentBookmark;
31
    private int currentIndex;
27
    private Bookmark<T> currentBookmark;
32 28
    private BookmarkListModel bookmarkListModel;
33 29

  
34
    public DefaultBookmarksPanel(Bookmarks bookmarks) {
30
    public DefaultBookmarksPanel(Bookmarks<T> bookmarks) {
35 31
        this(bookmarks, null);
36 32
    }
37 33

  
38
    public DefaultBookmarksPanel(Bookmarks bookmarks, T value) {
34
    public DefaultBookmarksPanel(Bookmarks<T> bookmarks, T value) {
39 35
        this.bookmarks = bookmarks;
40 36
        this.state = STATE_VIEWING;
41
        Bookmark bookmark = null;
42 37
        if (value != null) {
43
            bookmark = bookmarks.add(value.toString(), value);
44
        }
45
        if (bookmark != null) {
46
            Date now = new Date();
47
            String name = String.format(
48
                    "%tF %tR %s",
49
                    now, now,
50
                    bookmark.getName()
51
            );
52
//            
53
//            Bookmarks bookmarks = ExpressionEvaluatorLocator.getManager().getBookmarks();
54
//            Bookmark bookmark = bookmarks.add(name, expression);
55

  
38
            Bookmark<T> bookmark = bookmarks.add(value);
56 39
            this.put(bookmark);
57 40
            this.changeStateTo(STATE_MODIFYING);
58 41
        }
......
60 43
    }
61 44

  
62 45
    private void initComponents() {
63
        this.currentIndex = -1;
64 46
        this.currentBookmark = null;
65 47
        this.bookmarkListModel = this.createBookmarksModel();
66 48
        this.lstBookmarks.setModel(this.bookmarkListModel);
......
113 95

  
114 96
    private BookmarkListModel createBookmarksModel() {
115 97
        BookmarkListModel model = new BookmarkListModel();
116
        for (Object bookmark : bookmarks) {
117
            model.addElement((Bookmark) bookmark);
98
        for (Bookmark<T> bookmark : bookmarks) {
99
            model.addElement(bookmark);
118 100
        }
119 101
        return model;
120 102
    }
121 103

  
122
    public Bookmark getSelectedValue() {
104
    public Bookmark<T> getSelectedValue() {
123 105
        return this.currentBookmark;
124 106
    }
125 107

  
126
    private void put(Bookmark bookmark) {
108
    private void put(Bookmark<T> bookmark) {
127 109
        this.currentBookmark = bookmark;
128
        this.currentIndex = this.lstBookmarks.getSelectedIndex();
129 110
        this.txtLabel.setText(bookmark.getLabel());
130 111
        this.txtLabel.setCaretPosition(0);
131 112
        this.txtName.setText(bookmark.getName());
132 113
        this.txtLastUse.setText(String.valueOf(bookmark.getLastUse()));
133 114
    }
134 115

  
135
    private void fetch(Bookmark bookmark) {
116
    private void fetch(Bookmark<T> bookmark) {
136 117
        bookmark.setName(this.txtName.getText());
137 118
    }
138 119

  
139 120
    private void doDelete() {
140
        Bookmark bookmark = (Bookmark) this.lstBookmarks.getSelectedValue();
121
        Bookmark<T> bookmark = (Bookmark<T>) this.lstBookmarks.getSelectedValue();
141 122
        if (bookmark == null) {
142 123
            return;
143 124
        }
144
        //Bookmarks bookmarks = ExpressionEvaluatorLocator.getManager().getBookmarks();
145 125
        bookmarks.remove(bookmark.getName());
146 126
        this.bookmarkListModel = this.createBookmarksModel();
147 127
        this.lstBookmarks.setModel(this.bookmarkListModel);
......
149 129
    }
150 130

  
151 131
    private void doModify() {
152
        Bookmark bookmark = (Bookmark) this.lstBookmarks.getSelectedValue();
132
        Bookmark<T> bookmark = (Bookmark<T>) this.lstBookmarks.getSelectedValue();
153 133
        if (bookmark == null) {
154 134
            return;
155 135
        }
......
158 138
    }
159 139

  
160 140
    private void doAccept() {
161
        Bookmark bookmark = (Bookmark) this.lstBookmarks.getSelectedValue();
141
        Bookmark<T> bookmark = (Bookmark<T>) this.lstBookmarks.getSelectedValue();
162 142
        if (bookmark == null) {
163 143
            return;
164 144
        }
......
168 148
    }
169 149

  
170 150
    private void doDiscard() {
171
        Bookmark bookmark = (Bookmark) this.lstBookmarks.getSelectedValue();
151
        Bookmark<T> bookmark = (Bookmark<T>) this.lstBookmarks.getSelectedValue();
172 152
        if (bookmark == null) {
173 153
            return;
174 154
        }

Also available in: Unified diff