Changeset 13838

Show
Ignore:
Timestamp:
02/01/05 12:51:40 (4 years ago)
Author:
matt
Message:

Modified build of IntelliJ plugin to work with build 3193. (Probably
all of the post-4.5 series actually.)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/tools/intellij/pnetplugin/pnetplugin.iml

    r13408 r13838  
    4747      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> 
    4848    </content> 
    49     <orderEntry type="jdk" jdkName="java version &quot;1.4.2&quot;" /> 
     49    <orderEntry type="jdk" jdkName="java version &quot;1.4.2_07&quot;" /> 
    5050    <orderEntry type="sourceFolder" forTests="false" /> 
    5151    <orderEntry type="module-library"> 

  • trunk/tools/intellij/pnetplugin/pnetplugin.ipr

    r13685 r13838  
    66      <additionalClassPath /> 
    77      <antReference projectDefault="true" /> 
    8       <customJdkName value="java version &quot;1.4.2&quot;" /> 
     8      <customJdkName value="java version &quot;1.4.2_07&quot;" /> 
    99      <maximumHeapSize value="128" /> 
    1010      <properties> 
    …… 
    209209  </component> 
    210210  <component name="ProjectRootManager" version="2" assert-keyword="false" jdk-15="false" /> 
     211  <component name="ReadonlyStatusHandler"> 
     212    <option name="SHOW_DIALOG" value="true" /> 
     213  </component> 
    211214  <component name="RmicSettings"> 
    212215    <option name="IS_EANABLED" value="false" /> 
    …… 
    226229    <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" /> 
    227230  </component> 
     231  <UsedPathMacros /> 
    228232</project> 
    229233 

  • trunk/tools/intellij/pnetplugin/pnetplugin.iws

    r13685 r13838  
    88  <component name="CheckinPanelState" /> 
    99  <component name="Commander"> 
    10     <leftPanel url="file://$PROJECT_DIR$/src/net/project/devtools/pnetplugin" /> 
     10    <leftPanel /> 
    1111    <rightPanel /> 
    1212    <splitter proportion="0.5" /> 
    …… 
    1616    <option name="AUTO_SHOW_ERRORS_IN_EDITOR" value="true" /> 
    1717    <option name="CLOSE_MESSAGE_VIEW_IF_SUCCESS" value="true" /> 
     18    <option name="COMPILE_DEPENDENT_FILES" value="false" /> 
    1819  </component> 
    1920  <component name="Cvs2Configuration"> 
    …… 
    2122    <option name="ON_FILE_REMOVING" value="0" /> 
    2223    <option name="PRUNE_EMPTY_DIRECTORIES" value="true" /> 
    23     <option name="SHOW_UPDATE_OPTIONS" value="true" /> 
    2424    <option name="SHOW_ADD_OPTIONS" value="true" /> 
    2525    <option name="SHOW_REMOVE_OPTIONS" value="false" /> 
    …… 
    3232    <option name="PROCESS_UNKNOWN_FILES" value="false" /> 
    3333    <option name="PROCESS_DELETED_FILES" value="false" /> 
     34    <option name="PROCESS_IGNORED_FILES" value="false" /> 
    3435    <option name="SHOW_EDIT_DIALOG" value="false" /> 
    3536    <option name="RESERVED_EDIT" value="false" /> 
    36     <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" /> 
    3737    <option name="SHOW_CHECKOUT_OPTIONS" value="true" /> 
    3838    <option name="CHECKOUT_DATE_OR_REVISION_SETTINGS"> 
    …… 
    6161    </option> 
    6262    <option name="SHOW_OUTPUT" value="true" /> 
    63     <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" /> 
    64     <option name="UPDATE_GROUP_BY_PACKAGES" value="false" /> 
    6563    <option name="ADD_WATCH_INDEX" value="0" /> 
    6664    <option name="REMOVE_WATCH_INDEX" value="0" /> 
    …… 
    6967    <option name="SHOW_CORRUPTED_PROJECT_FILES" value="0" /> 
    7068    <option name="TAG_AFTER_FILE_COMMIT" value="false" /> 
     69    <option name="OVERRIDE_EXISTING_TAG_FOR_FILE" value="true" /> 
    7170    <option name="TAG_AFTER_FILE_COMMIT_NAME" value="" /> 
    7271    <option name="TAG_AFTER_PROJECT_COMMIT" value="false" /> 
     72    <option name="OVERRIDE_EXISTING_TAG_FOR_PROJECT" value="true" /> 
    7373    <option name="TAG_AFTER_PROJECT_COMMIT_NAME" value="" /> 
    74     <option name="PUT_FOCUS_INTO_COMMENT" value="false" /> 
    75     <option name="SHOW_CHECKIN_OPTIONS" value="true" /> 
    76     <option name="FORCE_NON_EMPTY_COMMENT" value="false" /> 
    77     <option name="LAST_COMMIT_MESSAGE" value="" /> 
    78     <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" /> 
    79     <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" /> 
    80     <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" /> 
    81     <option name="OPTIMIZE_IMPORTS_BEFORE_FILE_COMMIT" value="false" /> 
    82     <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" /> 
    83     <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" /> 
    84     <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" /> 
    85     <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" /> 
     74    <option name="CLEAN_COPY" value="false" /> 
    8675  </component> 
    8776  <component name="CvsTabbedWindow" /> 
    …… 
    9685        <option name="NOTIFY_UNCAUGHT" value="true" /> 
    9786        <option name="ENABLED" value="false" /> 
    98         <option name="SUSPEND_VM" value="true" /> 
     87        <option name="SUSPEND_POLICY" value="SuspendAll" /> 
    9988        <option name="LOG_ENABLED" value="false" /> 
    10089        <option name="LOG_EXPRESSION_ENABLED" value="false" /> 
    …… 
    345334    <option name="HIDE_WARNINGS" value="false" /> 
    346335  </component> 
    347   <component name="FileEditorManager" split-orientation="vertical" split-proportion="0.5"> 
    348     <first-group selected-file="file://$PROJECT_DIR$/src/net/project/devtools/pnetplugin/AddPropertyAction.java"> 
    349       <entry file="file://$PROJECT_DIR$/src/net/project/devtools/pnetplugin/AddPropertyDialog.java" pinned="false"> 
    350         <provider selected="true" editor-type-id="text-editor"> 
    351           <state line="368" column="52" selection-start="15466" selection-end="15466" vertical-scroll-proportion="1.6012862"> 
    352             <folding> 
    353               <element signature="imports" expanded="true" /> 
    354             </folding> 
    355           </state> 
    356         </provider> 
    357       </entry> 
    358       <entry file="file://$PROJECT_DIR$/src/net/project/devtools/pnetplugin/AddPropertyAction.java" pinned="false"> 
    359         <provider selected="true" editor-type-id="text-editor"> 
    360           <state line="23" column="0" selection-start="961" selection-end="961" vertical-scroll-proportion="0.48231512"> 
    361             <folding> 
    362               <element signature="imports" expanded="true" /> 
    363             </folding> 
    364           </state> 
    365         </provider> 
    366       </entry> 
    367       <entry file="file://$PROJECT_DIR$/src/net/project/devtools/pnetplugin/PnetPlugin.java" pinned="false"> 
    368         <provider selected="true" editor-type-id="text-editor"> 
    369           <state line="25" column="13" selection-start="820" selection-end="820" vertical-scroll-proportion="0.07378336"> 
    370             <folding /> 
    371           </state> 
    372         </provider> 
    373       </entry> 
    374       <entry file="file://$PROJECT_DIR$/src/META-INF/plugin.xml" pinned="false"> 
    375         <provider selected="true" editor-type-id="text-editor"> 
    376           <state line="48" column="108" selection-start="2614" selection-end="2614" vertical-scroll-proportion="1.1575563"> 
    377             <folding /> 
    378           </state> 
    379         </provider> 
    380       </entry> 
    381       <entry file="file://$PROJECT_DIR$/src/net/project/devtools/pnetplugin/ModifyPropertyAction.java" pinned="false"> 
    382         <provider selected="true" editor-type-id="text-editor"> 
    383           <state line="58" column="0" selection-start="2474" selection-end="2474" vertical-scroll-proportion="0.8712716"> 
    384             <folding /> 
    385           </state> 
    386         </provider> 
    387       </entry> 
    388       <entry file="file://$PROJECT_DIR$/ant/build.xml" pinned="false"> 
    389         <provider selected="true" editor-type-id="text-editor"> 
    390           <state line="85" column="67" selection-start="3035" selection-end="3035" vertical-scroll-proportion="0.28257456"> 
    391             <folding /> 
    392           </state> 
    393         </provider> 
    394       </entry> 
    395       <entry file="file://$PROJECT_DIR$/src/net/project/devtools/pnetplugin/DeletePropertyAction.java" pinned="false"> 
    396         <provider selected="true" editor-type-id="text-editor"> 
    397           <state line="58" column="63" selection-start="2433" selection-end="2433" vertical-scroll-proportion="0.51607716"> 
    398             <folding /> 
    399           </state> 
    400         </provider> 
    401       </entry> 
    402       <entry file="file://$PROJECT_DIR$/src/net/project/devtools/pnetplugin/Settings.java" pinned="false"> 
    403         <provider selected="true" editor-type-id="text-editor"> 
    404           <state line="26" column="0" selection-start="956" selection-end="956" vertical-scroll-proportion="0.4709576"> 
    405             <folding /> 
    406           </state> 
    407         </provider> 
    408       </entry> 
    409       <entry file="file://$PROJECT_DIR$/src/net/project/devtools/pnetplugin/AddPropertyActionNoModify.java" pinned="false"> 
    410         <provider selected="true" editor-type-id="text-editor"> 
    411           <state line="45" column="0" selection-start="1605" selection-end="1605" vertical-scroll-proportion="0.82417583"> 
    412             <folding /> 
    413           </state> 
    414         </provider> 
    415       </entry> 
    416     </first-group> 
    417     <second-group /> 
     336  <component name="FileEditorManager"> 
     337    <leaf> 
     338      <file leaf-file-name="AddPropertyAction.java" pinned="false" current="false" current-in-tab="false"> 
     339        <entry file="file://$PROJECT_DIR$/src/net/project/devtools/pnetplugin/AddPropertyAction.java"> 
     340          <provider selected="true" editor-type-id="text-editor"> 
     341            <state line="102" column="61" selection-start="4805" selection-end="4805" vertical-scroll-proportion="0.6546875"> 
     342              <folding> 
     343                <element signature="imports" expanded="true" /> 
     344              </folding> 
     345            </state> 
     346          </provider> 
     347        </entry> 
     348      </file> 
     349      <file leaf-file-name="build.xml" pinned="false" current="true" current-in-tab="true"> 
     350        <entry file="file://$PROJECT_DIR$/ant/build.xml"> 
     351          <provider selected="true" editor-type-id="text-editor"> 
     352            <state line="114" column="2" selection-start="4164" selection-end="4164" vertical-scroll-proportion="0.4793893"> 
     353              <folding /> 
     354            </state> 
     355          </provider> 
     356        </entry> 
     357      </file> 
     358      <file leaf-file-name="FileType.class" pinned="false" current="false" current-in-tab="false"> 
     359        <entry file="jar://$APPLICATION_HOME_DIR$/lib/openapi.jar!/com/intellij/openapi/fileTypes/FileType.class"> 
     360          <provider selected="true" editor-type-id="text-editor"> 
     361            <state line="33" column="0" selection-start="1270" selection-end="1270" vertical-scroll-proportion="0.75"> 
     362              <folding /> 
     363            </state> 
     364          </provider> 
     365        </entry> 
     366      </file> 
     367    </leaf> 
    418368  </component> 
    419369  <component name="HierarchyBrowserManager"> 
    …… 
    427377    <profile name="Default" /> 
    428378  </component> 
    429   <component name="J2EEProjectPane" /> 
     379  <component name="J2EEProjectPane"> 
     380    <setting name="SHOW_AS_DEPLOYMENT_VIEW" value="false" /> 
     381  </component> 
    430382  <component name="LvcsProjectConfiguration"> 
    431383    <option name="ADD_LABEL_ON_PROJECT_OPEN" value="true" /> 
    …… 
    438390    <option name="ADD_LABEL_ON_UNIT_TEST_FAILED" value="true" /> 
    439391  </component> 
     392  <component name="ModuleEditorState"> 
     393    <option name="LAST_EDITED_MODULE_NAME" value="pnetplugin" /> 
     394    <option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" /> 
     395  </component> 
    440396  <component name="NamedScopeManager" /> 
    441   <component name="PackagesPane"> 
    442     <expanded_node url="" module="pnetplugin" type="module" /> 
    443     <expanded_node url="net.project.devtools.pnetplugin" module="pnetplugin" type="package" /> 
    444     <expanded_node url="net.project" module="pnetplugin" type="package" /> 
    445     <expanded_node url="net" module="pnetplugin" type="package" /> 
    446     <expanded_node url="net.project.devtools" module="pnetplugin" type="package" /> 
    447   </component> 
    448   <component name="ProjectPane"> 
    449     <expanded_node url="file://$PROJECT_DIR$/src/net" module="pnetplugin" type="directory" /> 
    450     <expanded_node url="file://$PROJECT_DIR$/src/net/project" module="pnetplugin" type="directory" /> 
    451     <expanded_node url="file://$PROJECT_DIR$/src" module="pnetplugin" type="directory" /> 
    452     <expanded_node url="" module="pnetplugin" type="module" /> 
    453     <expanded_node url="file://$PROJECT_DIR$/src/net/project/devtools" module="pnetplugin" type="directory" /> 
    454     <expanded_node url="file://$PROJECT_DIR$/src/META-INF" module="pnetplugin" type="directory" /> 
    455     <expanded_node url="file://$PROJECT_DIR$" module="pnetplugin" type="directory" /> 
    456     <expanded_node url="file://$PROJECT_DIR$/src/net/project/devtools/pnetplugin" module="pnetplugin" type="directory" /> 
     397  <component name="PackagesPane" /> 
     398  <component name="PerforceDirect.Settings"> 
     399    <option name="useP4CONFIG" value="true" /> 
     400    <option name="port" value="jasper:1666" /> 
     401    <option name="client" value="" /> 
     402    <option name="user" value="" /> 
     403    <option name="passwd" value="" /> 
     404    <option name="useExtDiff" value="false" /> 
     405    <option name="extDiff" value="" /> 
     406    <option name="showCmds" value="false" /> 
     407    <option name="autoCheckoutAdd" value="true" /> 
     408    <option name="promptCheckoutAdd" value="true" /> 
     409    <option name="simpleP4Commands" value="false" /> 
     410    <option name="useNativeApi" value="false" /> 
     411    <option name="pathToExec" value="p4" /> 
     412    <option name="useCustomPathToExec" value="false" /> 
     413    <option name="SYNC_FORCE" value="false" /> 
     414    <option name="SYNC_RUN_RESOLVE" value="true" /> 
     415  </component> 
     416  <component name="ProjectPane" /> 
     417  <component name="ProjectReloadState"> 
     418    <option name="STATE" value="0" /> 
    457419  </component> 
    458420  <component name="ProjectView"> 
    …… 
    463425      <showLibraryContents /> 
    464426      <hideEmptyPackages /> 
     427      <abbreviatePackageNames /> 
    465428      <showStructure ProjectPane="false" /> 
    466429      <autoscrollToSource /> 
    …… 
    490453    <property name="GoToClass.toSaveIncludeLibraries" value="false" /> 
    491454  </component> 
     455  <component name="RestoreUpdateTree" /> 
    492456  <component name="RunManager"> 
    493457    <activeType name="Remote" /> 
    494     <configuration selected="false" default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local"> 
    495       <option name="WORKING_DIRECTORY" /> 
    496       <option name="HOST" value="localhost" /> 
    497       <option name="PORT" value="7001" /> 
    498       <option name="LOCAL" value="true" /> 
    499       <option name="OPEN_IN_BROWSER" value="true" /> 
    500       <option name="OPEN_IN_BROWSER_URL" value="/" /> 
    501       <option name="COMMON_VM_ARGUMENTS" value="" /> 
    502     </configuration> 
    503     <configuration selected="false" default="true" type="#com.intellij.j2ee.web.jsr45.JSR45ConfigurationFactory" factoryName="Remote"> 
    504       <option name="WORKING_DIRECTORY" /> 
    505       <option name="HOST" value="localhost" /> 
    506       <option name="PORT" value="7001" /> 
    507       <option name="LOCAL" value="false" /> 
    508       <option name="OPEN_IN_BROWSER" value="true" /> 
    509       <option name="OPEN_IN_BROWSER_URL" value="/" /> 
    510       <option name="COMMON_VM_ARGUMENTS" value="" /> 
    511       <option name="JSP_PACKAGE" value="" /> 
    512       <option name="VM_OPTS" value="VM_OPTS" /> 
    513       <option name="LOCAL_PORT" value="80" /> 
     458    <configuration selected="false" default="true" type="JUnit" factoryName="JUnit"> 
     459      <module name="" /> 
     460      <option name="PACKAGE_NAME" /> 
     461      <option name="MAIN_CLASS_NAME" /> 
     462      <option name="METHOD_NAME" /> 
     463      <option name="TEST_OBJECT" /> 
     464      <option name="VM_PARAMETERS" /> 
     465      <option name="PARAMETERS" /> 
     466      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> 
     467      <option name="ADDITIONAL_CLASS_PATH" /> 
     468      <option name="TEST_SEARCH_SCOPE"> 
     469        <value defaultName="wholeProject" /> 
     470      </option> 
     471    </configuration> 
     472    <configuration selected="false" default="true" type="Remote" factoryName="Remote"> 
     473      <option name="USE_SOCKET_TRANSPORT" value="false" /> 
     474      <option name="SERVER_MODE" value="false" /> 
     475      <option name="SHMEM_ADDRESS" /> 
     476      <option name="HOST" /> 
     477      <option name="PORT" /> 
    514478    </configuration> 
    515479    <configuration selected="false" default="true" type="Applet" factoryName="Applet"> 
    …… 
    522486      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/config/appletviewer.policy" /> 
    523487      <option name="VM_PARAMETERS" /> 
     488    </configuration> 
     489    <configuration selected="false" default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Remote"> 
     490      <option name="WORKING_DIRECTORY" /> 
     491      <option name="HOST" value="localhost" /> 
     492      <option name="PORT" value="7001" /> 
     493      <option name="LOCAL" value="false" /> 
     494      <option name="OPEN_IN_BROWSER" value="true" /> 
     495      <option name="OPEN_IN_BROWSER_URL" value="/" /> 
     496      <option name="COMMON_VM_ARGUMENTS" value="" /> 
     497    </configuration> 
     498    <configuration selected="false" default="true" type="WebLogic Instance" factoryName="Remote"> 
     499      <option name="WORKING_DIRECTORY" /> 
     500      <option name="HOST" value="localhost" /> 
     501      <option name="PORT" value="7001" /> 
     502      <option name="LOCAL" value="false" /> 
     503      <option name="OPEN_IN_BROWSER" value="true" /> 
     504      <option name="OPEN_IN_BROWSER_URL" value="/" /> 
     505      <option name="COMMON_VM_ARGUMENTS" value="" /> 
     506      <option name="DOMAIN_PATH" value="C:\bea\weblogic81\samples\domains\platform" /> 
     507      <option name="USER" value="weblogic" /> 
     508      <option name="PASSWORD" value="weblogic" /> 
     509      <option name="SERVER_NAME" value="cgServer" /> 
     510      <option name="DOMAIN_NAME" value="workshop" /> 
     511    </configuration> 
     512    <configuration selected="false" default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local"> 
     513      <option name="WORKING_DIRECTORY" /> 
     514      <option name="HOST" value="localhost" /> 
     515      <option name="PORT" value="7001" /> 
     516      <option name="LOCAL" value="true" /> 
     517      <option name="OPEN_IN_BROWSER" value="true" /> 
     518      <option name="OPEN_IN_BROWSER_URL" value="/" /> 
     519      <option name="COMMON_VM_ARGUMENTS" value="" /> 
     520    </configuration> 
     521    <configuration selected="false" default="true" type="#com.intellij.j2ee.web.jsr45.JSR45ConfigurationFactory" factoryName="Local"> 
     522      <option name="WORKING_DIRECTORY" /> 
     523      <option name="HOST" value="localhost" /> 
     524      <option name="PORT" value="7001" /> 
     525      <option name="LOCAL" value="true" /> 
     526      <option name="OPEN_IN_BROWSER" value="true" /> 
     527      <option name="OPEN_IN_BROWSER_URL" value="/" /> 
     528      <option name="COMMON_VM_ARGUMENTS" value="" /> 
     529      <option name="JSP_PACKAGE" value="" /> 
     530      <option name="VM_OPTS" value="VM_OPTS" /> 
     531      <option name="LOCAL_PORT" value="80" /> 
    524532    </configuration> 
    525533    <configuration selected="false" default="true" type="WebLogic Instance" factoryName="Local"> 
    …… 
    537545      <option name="DOMAIN_NAME" value="workshop" /> 
    538546    </configuration> 
    539     <configuration selected="false" default="true" type="#com.intellij.j2ee.web.jsr45.JSR45ConfigurationFactory" factoryName="Local"> 
    540       <option name="WORKING_DIRECTORY" /> 
    541       <option name="HOST" value="localhost" /> 
    542       <option name="PORT" value="7001" /> 
    543       <option name="LOCAL" value="true" /> 
    544       <option name="OPEN_IN_BROWSER" value="true" /> 
    545       <option name="OPEN_IN_BROWSER_URL" value="/" /> 
    546       <option name="COMMON_VM_ARGUMENTS" value="" /> 
    547       <option name="JSP_PACKAGE" value="" /> 
    548       <option name="VM_OPTS" value="VM_OPTS" /> 
    549       <option name="LOCAL_PORT" value="80" /> 
    550     </configuration> 
    551     <configuration selected="false" default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Remote"> 
     547    <configuration selected="false" default="true" type="#com.intellij.j2ee.web.jsr45.JSR45ConfigurationFactory" factoryName="Remote"> 
    552548      <option name="WORKING_DIRECTORY" /> 
    553549      <option name="HOST" value="localhost" /> 
    …… 
    557553      <option name="OPEN_IN_BROWSER_URL" value="/" /> 
    558554      <option name="COMMON_VM_ARGUMENTS" value="" /> 
    559     </configuration> 
    560     <configuration selected="false" default="true" type="Remote" factoryName="Remote"> 
    561       <option name="USE_SOCKET_TRANSPORT" value="false" /> 
    562       <option name="SERVER_MODE" value="false" /> 
    563       <option name="SHMEM_ADDRESS" /> 
    564       <option name="HOST" /> 
    565       <option name="PORT" /> 
    566     </configuration> 
    567     <configuration selected="false" default="true" type="WebLogic Instance" factoryName="Remote"> 
    568       <option name="WORKING_DIRECTORY" /> 
    569       <option name="HOST" value="localhost" /> 
    570       <option name="PORT" value="7001" /> 
    571       <option name="LOCAL" value="false" /> 
    572       <option name="OPEN_IN_BROWSER" value="true" /> 
    573       <option name="OPEN_IN_BROWSER_URL" value="/" /> 
    574       <option name="COMMON_VM_ARGUMENTS" value="" /> 
    575       <option name="DOMAIN_PATH" value="C:\bea\weblogic81\samples\domains\platform" /> 
    576       <option name="USER" value="weblogic" /> 
    577       <option name="PASSWORD" value="weblogic" /> 
    578       <option name="SERVER_NAME" value="cgServer" /> 
    579       <option name="DOMAIN_NAME" value="workshop" /> 
    580     </configuration> 
    581     <configuration selected="false" default="true" type="JUnit" factoryName="JUnit"> 
    582       <module name="" /> 
    583       <option name="PACKAGE_NAME" /> 
    584       <option name="MAIN_CLASS_NAME" /> 
    585       <option name="METHOD_NAME" /> 
    586       <option name="TEST_OBJECT" /> 
    587       <option name="VM_PARAMETERS" /> 
    588       <option name="PARAMETERS" /> 
    589       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> 
    590       <option name="ADDITIONAL_CLASS_PATH" /> 
    591       <option name="TEST_SEARCH_SCOPE"> 
    592         <value defaultName="wholeProject" /> 
    593       </option> 
     555      <option name="JSP_PACKAGE" value="" /> 
     556      <option name="VM_OPTS" value="VM_OPTS" /> 
     557      <option name="LOCAL_PORT" value="80" /> 
    594558    </configuration> 
    595559    <configuration selected="false" default="true" type="Application" factoryName="Application"> 
    …… 
    623587    <option name="VIEW" value="" /> 
    624588    <option name="ALTERNATIVE_WORKING_PATH" value="" /> 
     589  </component> 
     590  <component name="StructuralSearchPlugin" /> 
     591  <component name="StructureViewFactory"> 
     592    <option name="AUTOSCROLL_MODE" value="true" /> 
     593    <option name="AUTOSCROLL_FROM_SOURCE" value="false" /> 
     594    <option name="ACTIVE_ACTIONS" value="" /> 
     595  </component> 
     596  <component name="SvnConfiguration"> 
     597    <option name="USER" value="" /> 
     598    <option name="PASSWORD" value="" /> 
     599    <option name="AUTO_ADD_FILES" value="1" /> 
     600    <option name="AUTO_DEL_FILES" value="1" /> 
     601  </component> 
     602  <component name="TodoView" selected-index="0"> 
     603    <todo-panel id="selected-file"> 
     604      <are-packages-shown value="false" /> 
     605      <flatten-packages value="false" /> 
     606      <is-autoscroll-to-source value="true" /> 
     607    </todo-panel> 
     608    <todo-panel id="all"> 
     609      <are-packages-shown value="true" /> 
     610      <flatten-packages value="false" /> 
     611      <is-autoscroll-to-source value="true" /> 
     612    </todo-panel> 
     613  </component> 
     614  <component name="ToolWindowManager"> 
     615    <frame x="33" y="40" width="1580" height="1152" extended-state="0" /> 
     616    <editor active="false" /> 
     617    <layout> 
     618      <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> 
     619      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" /> 
     620      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.17650919" order="0" x="254" y="144" width="333" height="296" /> 
     621      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.32947975" order="3" /> 
     622      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.25" order="1" /> 
     623      <window_info id="Messages" active="true" anchor="bottom" auto_hide="true" internal_type="docked" type="docked" visible="true" weight="0.33171678" order="0" /> 
     624      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="7" /> 
     625      <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> 
     626      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.15813649" order="0" x="383" y="215" width="158" height="219" /> 
     627      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="4" /> 
     628      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.25" order="1" /> 
     629      <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="-1" /> 
     630      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="5" /> 
     631      <window_info id="Commander" active="false" anchor="bottom" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="8" /> 
     632      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="-1" /> 
     633      <window_info id="Workspaces" active="false" anchor="left" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="3" /> 
     634      <window_info id="BeanShell" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="8" /> 
     635      <window_info id="PsiViewer" active="false" anchor="right" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33023873" order="3" /> 
     636      <window_info id="Scratchpad" active="false" anchor="left" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="3" /> 
     637      <window_info id="Gold Section" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="8" /> 
     638      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.25" order="2" /> 
     639      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="2" /> 
     640      <window_info id="Aspects" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> 
     641      <window_info id="EJB" active="false" anchor="left" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.25" order="3" /> 
     642      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.25" order="6" /> 
     643      <window_info id="ToDo" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="1" /> 
     644    </layout> 
     645  </component> 
     646  <component name="VCS.FileViewConfiguration"> 
     647    <option name="SELECTED_STATUSES" value="DEFAULT" /> 
     648    <option name="SELECTED_COLUMNS" value="DEFAULT" /> 
     649    <option name="SHOW_FILTERS" value="true" /> 
     650    <option name="CUSTOMIZE_VIEW" value="true" /> 
     651    <option name="SHOW_FILE_HISTORY_AS_TREE" value="true" /> 
     652  </component> 
     653  <component name="VcsManagerConfiguration"> 
    625654    <option name="PUT_FOCUS_INTO_COMMENT" value="false" /> 
    626655    <option name="SHOW_CHECKIN_OPTIONS" value="true" /> 
    …… 
    635664    <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" /> 
    636665    <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" /> 
    637   </component> 
    638   <component name="StructuralSearchPlugin" /> 
    639   <component name="StructureViewFactory"> 
    640     <option name="SORT_MODE" value="0" /> 
    641     <option name="GROUP_INHERITED" value="true" /> 
    642     <option name="AUTOSCROLL_MODE" value="true" /> 
    643     <option name="SHOW_FIELDS" value="true" /> 
    644     <option name="AUTOSCROLL_FROM_SOURCE" value="false" /> 
    645     <option name="GROUP_GETTERS_AND_SETTERS" value="true" /> 
    646     <option name="SHOW_INHERITED" value="false" /> 
    647     <option name="HIDE_NOT_PUBLIC" value="false" /> 
    648   </component> 
    649   <component name="TodoView" selected-index="0"> 
    650     <todo-panel id="selected-file"> 
    651       <are-packages-shown value="false" /> 
    652       <flatten-packages value="false" /> 
    653       <is-autoscroll-to-source value="true" /> 
    654     </todo-panel> 
    655     <todo-panel id="all"> 
    656       <are-packages-shown value="true" /> 
    657       <flatten-packages value="false" /> 
    658       <is-autoscroll-to-source value="true" /> 
    659     </todo-panel> 
    660   </component> 
    661   <component name="ToolWindowManager"> 
    662     <frame x="-4" y="-4" width="1608" height="1174" extended-state="0" /> 
    663     <editor active="false" /> 
    664     <layout> 
    665       <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> 
    666       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" /> 
    667       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.21401028" order="0" x="254" y="144" width="333" height="296" /> 
    668       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.32947975" order="3" /> 
    669       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.25" order="1" /> 
    670       <window_info id="Messages" active="true" anchor="bottom" auto_hide="true" internal_type="docked" type="docked" visible="true" weight="0.32217973" order="0" /> 
    671       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="7" /> 
    672       <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> 
    673       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.16131106" order="0" x="383" y="215" width="158" height="219" /> 
    674       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="4" /> 
    675       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.25" order="1" /> 
    676       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="5" /> 
    677       <window_info id="Commander" active="false" anchor="bottom" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="8" /> 
    678       <window_info id="Workspaces" active="false" anchor="left" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="3" /> 
    679       <window_info id="BeanShell" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="8" /> 
    680       <window_info id="PsiViewer" active="false" anchor="right" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33023873" order="3" /> 
    681       <window_info id="Gold Section" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="8" /> 
    682       <window_info id="Scratchpad" active="false" anchor="left" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="3" /> 
    683       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.25" order="2" /> 
    684       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="2" /> 
    685       <window_info id="Aspects" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> 
    686       <window_info id="EJB" active="false" anchor="left" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.25" order="3" /> 
    687       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.25" order="6" /> 
    688       <window_info id="ToDo" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="1" /> 
    689     </layout> 
    690   </component> 
    691   <component name="VCS.FileViewConfiguration"> 
    692     <option name="SELECTED_STATUSES" value="DEFAULT" /> 
    693     <option name="SELECTED_COLUMNS" value="DEFAULT" /> 
    694     <option name="SHOW_FILTERS" value="true" /> 
    695     <option name="CUSTOMIZE_VIEW" value="true" /> 
    696     <option name="SHOW_FILE_HISTORY_AS_TREE" value="true" /> 
    697   </component> 
    698   <component name="VcsManagerConfiguration"> 
    699666    <option name="ACTIVE_VCS_NAME" value="" /> 
    700     <option name="STATE" value="0" /> 
     667    <option name="UPDATE_GROUP_BY_PACKAGES" value="false" /> 
     668    <option name="SHOW_UPDATE_OPTIONS" value="true" /> 
     669    <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" /> 
     670    <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" /> 
     671    <option name="SHOW_STATUS_OPTIONS" value="true" /> 
    701672  </component> 
    702673  <component name="VssConfiguration"> 
     674    <option name="CLIENT_PATH" value="" /> 
     675    <option name="SRCSAFEINI_PATH" value="" /> 
     676    <option name="USER_NAME" value="" /> 
     677    <option name="PWD" value="" /> 
     678    <option name="SHOW_CHECKOUT_OPTIONS" value="true" /> 
     679    <option name="SHOW_ADD_OPTIONS" value="true" /> 
     680    <option name="VSS_IS_INITIALIZED" value="true" /> 
     681    <option name="SHOW_UNDOCHECKOUT_OPTIONS" value="true" /> 
     682    <option name="SHOW_DIFF_OPTIONS" value="true" /> 
     683    <option name="SHOW_GET_OPTIONS" value="true" /> 
     684    <option name="REUSE_LAST_COMMENT" value="false" /> 
    703685    <CheckoutOptions> 
    704686      <option name="COMMENT" value="" /> 
    …… 
    728710      <option name="RECURSIVE" value="false" /> 
    729711    </GetOptions> 
    730     <option name="CLIENT_PATH" value="" /> 
    731     <option name="SRCSAFEINI_PATH" value="" /> 
    732     <option name="USER_NAME" value="" /> 
    733     <option name="PWD" value="" /> 
    734     <option name="SHOW_CHECKOUT_OPTIONS" value="true" /> 
    735     <option name="SHOW_ADD_OPTIONS" value="true" /> 
    736     <option name="VSS_IS_INITIALIZED" value="false" /> 
    737     <option name="SHOW_UNDOCHECKOUT_OPTIONS" value="true" /> 
    738     <option name="SHOW_DIFF_OPTIONS" value="true" /> 
    739     <option name="SHOW_GET_OPTIONS" value="true" /> 
    740     <option name="REUSE_LAST_COMMENT" value="false" /> 
    741     <option name="PUT_FOCUS_INTO_COMMENT" value="false" /> 
    742     <option name="SHOW_CHECKIN_OPTIONS" value="true" /> 
    743     <option name="FORCE_NON_EMPTY_COMMENT" value="false" /> 
    744     <option name="LAST_COMMIT_MESSAGE" value="" /> 
    745     <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" /> 
    746     <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" /> 
    747     <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" /> 
    748     <option name="OPTIMIZE_IMPORTS_BEFORE_FILE_COMMIT" value="false" /> 
    749     <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" /> 
    750     <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" /> 
    751     <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" /> 
    752     <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" /> 
    753712  </component> 
    754713  <component name="WebViewSettings"> 
    …… 
    867826      </provider> 
    868827    </entry> 
    869     <entry file="file://$PROJECT_DIR$/ant/build.xml"> 
    870       <provider selected="true" editor-type-id="text-editor"> 
    871         <state line="85" column="67" selection-start="3035" selection-end="3035" vertical-scroll-proportion="0.28257456"> 
     828    <entry file="jar://$APPLICATION_HOME_DIR$/lib/openapi.jar!/com/intellij/openapi/fileTypes/FileType.class"> 
     829      <provider selected="true" editor-type-id="text-editor"> 
     830        <state line="33" column="0" selection-start="1270" selection-end="1270" vertical-scroll-proportion="0.75"> 
    872831          <folding /> 
    873832        </state> 
    …… 
    876835    <entry file="file://$PROJECT_DIR$/src/net/project/devtools/pnetplugin/AddPropertyAction.java"> 
    877836      <provider selected="true" editor-type-id="text-editor"> 
    878         <state line="23" column="0" selection-start="961" selection-end="961" vertical-scroll-proportion="0.48231512"> 
     837        <state line="102" column="61" selection-start="4805" selection-end="4805" vertical-scroll-proportion="0.6546875"> 
    879838          <folding> 
    880839            <element signature="imports" expanded="true" /> 
    881840          </folding> 
     841        </state> 
     842      </provider> 
     843    </entry> 
     844    <entry file="file://$PROJECT_DIR$/ant/build.xml"> 
     845      <provider selected="true" editor-type-id="text-editor"> 
     846        <state line="114" column="2" selection-start="4164" selection-end="4164" vertical-scroll-proportion="0.4793893"> 
     847          <folding /> 
    882848        </state> 
    883849      </provider> 

  • trunk/tools/intellij/pnetplugin/src/net/project/devtools/pnetplugin/AddPropertyAction.java

    r13685 r13838  
    55package net.project.devtools.pnetplugin; 
    66 
    7 import com.intellij.openapi.actionSystem.DataConstants; 
    87import com.intellij.openapi.actionSystem.DataContext; 
     8import com.intellij.openapi.editor.Document; 
    99import com.intellij.openapi.editor.Editor; 
    10 import com.intellij.openapi.editor.Document; 
    1110import com.intellij.openapi.editor.SelectionModel; 
    1211import com.intellij.openapi.editor.actionSystem.EditorAction; 
    1312import com.intellij.openapi.editor.actionSystem.EditorWriteActionHandler; 
     13import com.intellij.openapi.fileEditor.FileEditorManager; 
     14import com.intellij.openapi.fileTypes.FileType; 
     15import com.intellij.openapi.fileTypes.FileTypeManager; 
    1416import com.intellij.openapi.project.Project; 
    15 import com.intellij.openapi.fileEditor.FileEditorManager; 
    16 import com.intellij.openapi.fileTypes.FileTypeManager; 
    17 import com.intellij.openapi.fileTypes.FileType; 
    1817import com.intellij.openapi.vfs.VirtualFile; 
    19 import com.intellij.psi.PsiManager; 
    20 import javax.swing.SwingUtilities; 
    21 import javax.swing.JFrame; 
    2218import java.text.CharacterIterator; 
    2319import java.text.StringCharacterIterator; 
     20import javax.swing.JFrame; 
     21import javax.swing.SwingUtilities; 
    2422 
    2523/** 
    …… 
    9795        String extension = file.getExtension(); 
    9896 
    99         if (fileType.equals(FileType.JSP)) { 
     97        if (extension.equalsIgnoreCase("jsp")) { 
    10098            //TODO: JSP is interesting.  There are a number of contexts: 
    10199            //  1. Inside of a scriptlet (use PropertyProvider) 
    …… 
    124122                return JSP_DISPLAY_GET; 
    125123            } 
    126         } else if (fileType.equals(FileType.JAVA)) { 
     124        } else if (extension.equalsIgnoreCase("java")) { 
    127125            return PROPERTY_PROVIDER_GET; 
    128         } else if (fileType.equals(FileType.XML) && extension.equalsIgnoreCase("xsl")) { 
     126        } else if (extension.equalsIgnoreCase("xsl")) { 
    129127            return XSL_DISPLAY_GET; 
    130128        } else { 

  • trunk/tools/test/mockobjects/src/net/project/mockobjects/MockHttpSession.java

    r13835 r13838  
    5656    /** 
    5757     * @deprecated 
    58      */ 
     58     */                           
    5959    public Object getValue(String postID) { 
    6060        throw new RuntimeException("Method Object getValue(String postID) is not implemented");