Revision 44644 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/main/java/org/gvsig/expressionevaluator/impl/ExpressionEvaluatorImplLibrary.java

View differences:

ExpressionEvaluatorImplLibrary.java
1 1
package org.gvsig.expressionevaluator.impl;
2 2

  
3
import org.cresques.ProjectionLibrary;
4 3
import org.gvsig.expressionevaluator.DataTypes;
5 4
import org.gvsig.expressionevaluator.ExpressionEvaluatorLibrary;
6 5
import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator;
......
8 7
import org.gvsig.expressionevaluator.impl.coercion.CoerceToExpression;
9 8
import org.gvsig.expressionevaluator.impl.coercion.CoerceToString;
10 9
import org.gvsig.expressionevaluator.impl.grammars.BasicGrammarFactory;
10
import org.gvsig.expressionevaluator.impl.repr.ReprBoolean;
11
import org.gvsig.expressionevaluator.impl.repr.ReprCharSequence;
12
import org.gvsig.expressionevaluator.impl.repr.ReprDate;
13
import org.gvsig.expressionevaluator.impl.repr.ReprNumber;
11 14
import org.gvsig.expressionevaluator.impl.symboltable.BasicImageSymbolTableFactory;
12 15
import org.gvsig.expressionevaluator.impl.symboltable.FoldersSymbolTableFactory;
13
import org.gvsig.expressionevaluator.impl.symboltable.OGCSymbolTableFactory;
14 16
import org.gvsig.expressionevaluator.impl.symboltable.ProgrammingSymbolTableFactory;
15 17
import org.gvsig.expressionevaluator.impl.symboltable.SQLSymbolTableFactory;
16 18
import org.gvsig.expressionevaluator.impl.symboltable.UtilsSymbolTableFactory;
17
import org.gvsig.fmap.geom.GeometryLibrary;
18 19
import org.gvsig.tools.ToolsLibrary;
19 20
import org.gvsig.tools.ToolsLocator;
20 21
import org.gvsig.tools.dataTypes.DataTypesManager;
21 22
import org.gvsig.tools.library.AbstractLibrary;
22 23
import org.gvsig.tools.library.LibraryException;
23
import org.gvsig.tools.script.impl.DummyScriptManager;
24 24

  
25 25
public class ExpressionEvaluatorImplLibrary extends AbstractLibrary {
26 26

  
......
28 28
    public void doRegistration() {
29 29
        registerAsImplementationOf(ExpressionEvaluatorLibrary.class);
30 30
        require(ToolsLibrary.class);
31
        require(ProjectionLibrary.class);
32
        require(GeometryLibrary.class);        
33 31
    }
34 32

  
35 33
    @Override
......
42 40
        ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
43 41
        
44 42
        manager.registerSymbolTable(new SQLSymbolTableFactory());
45
        manager.registerSymbolTable(new OGCSymbolTableFactory());
46 43
        manager.registerSymbolTable(new UtilsSymbolTableFactory());
47 44
        manager.registerSymbolTable(new BasicImageSymbolTableFactory());
48 45
        manager.registerSymbolTable(new ProgrammingSymbolTableFactory());
......
58 55
        dataTypesManager.addCoercion(DataTypes.STRING,new CoerceToString());
59 56
        
60 57
        ToolsLocator.registerScriptManager(DefaultExpressionEvaluatorManager.class);
58
        
59
        ReprBoolean.selfRegister();
60
        ReprCharSequence.selfRegister();
61
        ReprNumber.selfRegister();
62
        ReprDate.selfRegister();
63
        
61 64
    }
62 65
}
63 66

  

Also available in: Unified diff