Commit 0e706765 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

Debugging property inheritance (it was applied twice and did not work)

parent 07259d40

src/com/elphel/vdt/VDT.java

+5 −1
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package com.elphel.vdt; 


import org.eclipse.core.runtime.QualifiedName;



import com.elphel.vdt.veditor.HdlNature;



/**

 * Central access point for the VDT plug-in (id <code>"com.elphel.vdt.ui"</code>).

 *
@@ -44,7 +46,8 @@ public class VDT { 
    /** The identifier for the Verilog nature */

    

//??????????????????????????????    

    public static final String VERILOG_NATURE_ID  = ID_VDT + ".VerilogNature";

//    public static final String VERILOG_NATURE_ID  = ID_VDT + ".VerilogNature";

    public static final String VERILOG_NATURE_ID  = HdlNature.NATURE_ID; // TODO

    public static final String PREFERENCE_PAGE_ID = ID_VDT + ".ui.preferences.PreferencePage";

        

    //-------------------------------------------------------------------------
@@ -140,6 +143,7 @@ public class VDT { 
    public static final String GENERATOR_ID_TOP_MODULE    = "TopModule"; 

    public static final String GENERATOR_ID_TOP_MODULES   = "TopModules"; 

    public static final String GENERATOR_ID_CURRENT_FILE  = "CurrentFile"; 

    public static final String GENERATOR_ID_SELECTED_FILE = "SelectedFile"; 

    public static final String GENERATOR_ID_CURRENT_BASE  = "CurrentFileBase"; 

    public static final String GENERATOR_ID_OS_NAME       = "OS";

} // class VDT

src/com/elphel/vdt/core/launching/LaunchCore.java

+4 −4
Original line number Diff line number Diff line
@@ -156,14 +156,14 @@ public class LaunchCore { 
            packageContext.setWorkingDirectory(project.getLocation().toOSString()); /* TODO - Modify for actual directory */

            packageContext.buildParams();    

        }

        Context context = tool.getParentProject();

        Context context = tool.getParentProject(); // for iverilog - "project_settings"

        if (context != null) {

            OptionsCore.doLoadContextOptions(context, project);

            OptionsCore.doLoadContextOptions(context, project); // stored values

            context.setWorkingDirectory(project.getLocation().toOSString());

            context.buildParams();    

            context.buildParams(); // correct context, but nothing got - Should it be? What the sense of the output - some control files?

        }

        OptionsCore.doLoadContextOptions(tool, project);

        OptionsCore.doLoadLocation(tool);

        OptionsCore.doLoadLocation(tool); // here it resolves condition with OS

    } // updateContextOptions()

    

    public static ILaunchConfiguration createLaunchConfiguration( Tool tool

src/com/elphel/vdt/core/tools/EntityUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import java.util.*; 
import com.elphel.vdt.core.tools.config.ConfigException;



public class EntityUtils {



// Updating tool context (to) from project context (from), items in to have now null context, in from - ProjectContext

    public static <T extends Updateable> void update(List<T> from, List<T> to)

        throws ConfigException 

    {
@@ -34,7 +34,7 @@ public class EntityUtils { 
            T itemToUpdate = null;



            for(T toItem : to) {                

                if(baseItem.matches(toItem)) {

                if(baseItem.matches(toItem)) { // Did we miss redefined item here? (after I adding copying context to clone)? - no, just supposed to have no context

                    itemToUpdate = toItem;          

                    break;

                }

src/com/elphel/vdt/core/tools/config/xml/AbstractConditionNodeReader.java

+4 −0
Original line number Diff line number Diff line
@@ -33,4 +33,8 @@ public abstract class AbstractConditionNodeReader { 
    }

    

    public abstract void readNode(Node node, Condition condition) throws ConfigException;

    

    public String getConfigFileName(){

    	return config.getConfigFileName();

    }

}

src/com/elphel/vdt/core/tools/config/xml/ParamNodeReader.java

+4 −3
Original line number Diff line number Diff line
@@ -60,10 +60,9 @@ public class ParamNodeReader extends AbstractConditionNodeReader { 
        String label        = XMLConfig.getAttributeValue(paramNode, XMLConfig.PARAMETER_LABEL_ATTR);

        String readOnly     = XMLConfig.getAttributeValue(paramNode, XMLConfig.PARAMETER_READONLY_ATTR);

        String visible      = XMLConfig.getAttributeValue(paramNode, XMLConfig.PARAMETER_VISIBLE_ATTR);

        

        if(id == null)

            throw new ConfigException("Context '" + context.getName() + ": Parameter id is absent");

                

//getConfigFileName                

        return new Parameter(id,

                             outid,

                             typeName,
@@ -73,6 +72,8 @@ public class ParamNodeReader extends AbstractConditionNodeReader { 
                             omitValue,

                             readOnly,

                             visible,

                             condition);

                             condition,

                             getConfigFileName() //.getConfigFileName()

                             );

    }

}