Commit 5a297385 authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Navigation improvements, refactoring and bugfix

parent fd930a24

TapSchemaManager/pom.xml

+1 −15
Original line number Diff line number Diff line
@@ -32,15 +32,10 @@ 
            <artifactId>TapSchemaManagerDL</artifactId>

            <version>1.0-SNAPSHOT</version>

        </dependency>

        <dependency>

            <groupId>it.inaf.oats.ia2</groupId>

            <artifactId>TapSchemaManagerBL</artifactId>

            <version>1.0-SNAPSHOT</version>

        </dependency>

        <dependency>

            <groupId>javax</groupId>

            <artifactId>javaee-web-api</artifactId>

            <version>6.0</version>

            <version>7.0</version>

            <scope>provided</scope>

        </dependency>

        <dependency>
@@ -55,15 +50,6 @@ 
            <artifactId>jersey-container-servlet</artifactId>

            <scope>provided</scope>

        </dependency>

        <dependency>

            <groupId>org.glassfish.jersey.ext</groupId>

            <artifactId>jersey-mvc-jsp</artifactId>

        </dependency>

        <!-- JSON support -->

        <dependency>

            <groupId>org.glassfish.jersey.media</groupId>

            <artifactId>jersey-media-moxy</artifactId>

        </dependency>

        <dependency>

            <groupId>com.google.code.gson</groupId>

            <artifactId>gson</artifactId>

TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/businesslayer/Column.java

+2 −1
Original line number Diff line number Diff line
@@ -2,12 +2,13 @@ package it.inaf.oats.ia2.tapschemamanager.businesslayer; 


import it.inaf.oats.ia2.tapschemamanager.datalayer.ColumnEntity;

import it.inaf.oats.ia2.tapschemamanager.datalayer.TapSchemaHandler;

import java.io.Serializable;



/**

 *

 * @author Sonia Zorba <zorba at oats.inaf.it>

 */

public class Column extends EntityWrapper<ColumnEntity> {

public class Column extends EntityWrapper<ColumnEntity> implements Serializable {



    public static final String UTYPE = "utype";

    public static final String UCD = "ucd";

TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/businesslayer/Schema.java

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ package it.inaf.oats.ia2.tapschemamanager.businesslayer; 
import it.inaf.oats.ia2.tapschemamanager.datalayer.SchemaEntity;

import it.inaf.oats.ia2.tapschemamanager.datalayer.TableEntity;

import it.inaf.oats.ia2.tapschemamanager.datalayer.TapSchemaHandler;

import java.io.Serializable;

import java.sql.SQLException;

import java.util.ArrayList;

import java.util.Iterator;
@@ -14,7 +15,7 @@ import java.util.TreeMap; 
 *

 * @author Sonia Zorba <zorba at oats.inaf.it>

 */

public class Schema extends EntityWrapper<SchemaEntity> implements EntityWrapperContainer<Table> {

public class Schema extends EntityWrapper<SchemaEntity> implements EntityWrapperContainer<Table>, Serializable {



    public static final String UTYPE = "utype";

    public static final String DESCRIPTION = "description";

TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/businesslayer/Table.java

+2 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ import it.inaf.oats.ia2.tapschemamanager.datalayer.ColumnInfo; 
import it.inaf.oats.ia2.tapschemamanager.datalayer.DLUtil;

import it.inaf.oats.ia2.tapschemamanager.datalayer.TableEntity;

import it.inaf.oats.ia2.tapschemamanager.datalayer.TapSchemaHandler;

import java.io.Serializable;

import java.sql.SQLException;

import java.util.ArrayList;

import java.util.List;
@@ -15,7 +16,7 @@ import java.util.TreeMap; 
 *

 * @author Sonia Zorba <zorba at oats.inaf.it>

 */

public class Table extends EntityWrapper<TableEntity> implements EntityWrapperContainer<Column> {

public class Table extends EntityWrapper<TableEntity> implements EntityWrapperContainer<Column>, Serializable {



    public static final String UTYPE = "utype";

    public static final String DESCRIPTION = "description";

TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/businesslayer/TapSchema.java

+12 −6
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ package it.inaf.oats.ia2.tapschemamanager.businesslayer; 
import it.inaf.oats.ia2.tapschemamanager.datalayer.Credentials;

import it.inaf.oats.ia2.tapschemamanager.datalayer.SchemaEntity;

import it.inaf.oats.ia2.tapschemamanager.datalayer.TapSchemaHandler;

import java.io.Serializable;

import java.sql.SQLException;

import java.util.ArrayList;

import java.util.Iterator;
@@ -14,7 +15,7 @@ import java.util.TreeMap; 
 *

 * @author Sonia Zorba <zorba at oats.inaf.it>

 */

public class TapSchema implements EntityWrapperContainer<Schema> {

public class TapSchema implements EntityWrapperContainer<Schema>, Serializable {



    private final TapSchemaHandler tapSchemaHandler;
@@ -31,9 +32,11 @@ public class TapSchema implements EntityWrapperContainer<Schema> { 


        if (exists) {

            for (SchemaEntity schemaEntity : tapSchemaHandler.getSchemas()) {

                if (!schemaEntity.getName().equals(tapSchemaName)) {

                    Schema schema = new Schema(tapSchemaHandler, schemaEntity);

                    schemas.put(schema.getName(), schema);

                }

            }

            if (!schemas.isEmpty()) {

                selectEntity(schemas.keySet().iterator().next()); // select first schema

            }
@@ -68,10 +71,13 @@ public class TapSchema implements EntityWrapperContainer<Schema> { 
        return table == null ? null : table.getSelectedEntity();

    }





    @Override

    public List<String> getAddables() {

        return Util.getAddables(tapSchemaHandler.getAllSchemas(), schemas.keySet());

        List<String> addables = Util.getAddables(tapSchemaHandler.getAllSchemas(), schemas.keySet());

        if(addables.contains(name)) {

            addables.remove(name);

        }

        return addables;

    }



    @Override