| 36 |
36 |
import org.gvsig.expressionevaluator.impl.repr.ReprNull;
|
| 37 |
37 |
import org.gvsig.expressionevaluator.impl.repr.ReprObject;
|
| 38 |
38 |
import org.gvsig.expressionevaluator.spi.formatter.value.BaseFormatter;
|
|
39 |
import org.gvsig.tools.ToolsLocator;
|
| 39 |
40 |
import org.gvsig.tools.bookmarksandhistory.Bookmarks;
|
| 40 |
41 |
import org.gvsig.tools.bookmarksandhistory.History;
|
| 41 |
42 |
import org.gvsig.tools.bookmarksandhistory.impl.BaseBookmarks;
|
| ... | ... | |
| 54 |
55 |
private Double accuracy;
|
| 55 |
56 |
private final Map<String,SymbolTableFactory>symbolTableFactories;
|
| 56 |
57 |
private final Map<String,GrammarFactory> grammarFactories;
|
| 57 |
|
private Bookmarks<Expression> bookmarks;
|
| 58 |
|
private History<Expression> history;
|
|
58 |
private Bookmarks<Object> bookmarks;
|
|
59 |
private static final String BOOKMARKSANDHISTORY_NAME = "ExpressionManager";
|
|
60 |
private History<Object> history;
|
| 59 |
61 |
private SymbolTable inmutableSymbolTable;
|
| 60 |
62 |
private ResourcesStorage scriptsResourcesStorage;
|
| 61 |
63 |
private List<ClassLoader> loaders;
|
| ... | ... | |
| 306 |
308 |
}
|
| 307 |
309 |
|
| 308 |
310 |
@Override
|
| 309 |
|
public Bookmarks<Expression> getBookmarks() {
|
|
311 |
public Bookmarks<Object> getBookmarks() {
|
| 310 |
312 |
if( this.bookmarks==null ) {
|
| 311 |
|
this.bookmarks = new BaseBookmarks<>();
|
|
313 |
this.bookmarks = ToolsLocator.getBookmarksAndHistoryManager().getBookmarksGroup(BOOKMARKSANDHISTORY_NAME); //new BaseBookmarks<>();.
|
|
314 |
|
| 312 |
315 |
}
|
| 313 |
316 |
return this.bookmarks;
|
| 314 |
317 |
}
|
| 315 |
318 |
|
| 316 |
319 |
@Override
|
| 317 |
|
public History<Expression> getHistory() {
|
|
320 |
public History<Object> getHistory() {
|
| 318 |
321 |
if( this.history==null ) {
|
| 319 |
|
this.history = new BaseHistory<>(20);
|
|
322 |
this.history = ToolsLocator.getBookmarksAndHistoryManager().getHistoryGroup(BOOKMARKSANDHISTORY_NAME); //new BaseHistory<>(20);
|
| 320 |
323 |
}
|
| 321 |
324 |
return this.history;
|
| 322 |
325 |
}
|