[tracklink commit] r56 - in trunk: . modules/plugin modules/selena modules/selena/src/com/almworks/tracklink/vcslink...
codesite...@google.com
Date: Sat May 19 04:35:45 2007
New Revision: 56
Modified:
trunk/modules/plugin/plugin.iml
trunk/modules/selena/selena.iml
trunk/modules/selena/src/com/almworks/tracklink/vcslinks/VCSUtil.java
trunk/modules/tracklink/src/com/almworks/tracklink/filemonitoring/FileMapperImpl.java
trunk/modules/tracklink/src/com/almworks/tracklink/filemonitoring/FileMapperManager.java
trunk/modules/tracklink/tracklink.iml
trunk/tracklink7.ipr
Log:
getProjectFile() error fix
Modified: trunk/modules/plugin/plugin.iml
==============================================================================
--- trunk/modules/plugin/plugin.iml (original)
+++ trunk/modules/plugin/plugin.iml Sat May 19 04:35:45 2007
@@ -2,14 +2,14 @@
<module relativePaths="true" type="PLUGIN_MODULE" version="4">
<component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/META-INF/plugin.xml" />
<component name="ModuleRootManager" />
- <component inherit-compiler-output="true" name="NewModuleRootManager">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
- <orderEntry forTests="false" type="sourceFolder" />
- <orderEntry module-name="demetra" type="module" />
- <orderEntry module-name="tracklink" type="module" />
- <orderEntry module-name="selena" type="module" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="demetra" />
+ <orderEntry type="module" module-name="tracklink" />
+ <orderEntry type="module" module-name="selena" />
<orderEntryProperties />
</component>
</module>
Modified: trunk/modules/selena/selena.iml
==============================================================================
--- trunk/modules/selena/selena.iml (original)
+++ trunk/modules/selena/selena.iml Sat May 19 04:35:45 2007
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
- <component name="ModuleRootManager" />
- <component inherit-compiler-output="true" name="NewModuleRootManager">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder isTestSource="false" url="file://$MODULE_DIR$/src" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry forTests="false" type="sourceFolder" />
- <orderEntry module-name="tracklink" type="module" />
- <orderEntry level="project" name="almworks-tracker-api" type="library" />
- <orderEntryProperties />
- </component>
-</module>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+ <component name="ModuleRootManager" />
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="tracklink" />
+ <orderEntry type="library" name="almworks-tracker-api" level="project" />
+ <orderEntryProperties />
+ </component>
+</module>
+
Modified: trunk/modules/selena/src/com/almworks/tracklink/vcslinks/VCSUtil.java
==============================================================================
--- trunk/modules/selena/src/com/almworks/tracklink/vcslinks/VCSUtil.java (original)
+++ trunk/modules/selena/src/com/almworks/tracklink/vcslinks/VCSUtil.java Sat May 19 04:35:45 2007
@@ -8,10 +8,7 @@
import com.intellij.openapi.diff.DiffTool;
import com.intellij.openapi.diff.SimpleDiffRequest;
import com.intellij.openapi.fileEditor.OpenFileDescriptor;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.project.Project;
-import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.Pair;
@@ -242,17 +239,19 @@
} else {
// todo remove this hack
String projectFilePath;
- projectFilePath = project.getProjectFilePath();
- int pos = lastSeparatorIndex(projectFilePath);
- if (pos > -1)
- projectFilePath = projectFilePath.substring(0, pos);
- String filePath = path;
- pos = firstSeparatorIndex(filePath);
- if (pos > -1)
- filePath = filePath.substring(pos);
- else
- filePath = File.separator + filePath;
- newPath = projectFilePath + filePath;
+ VirtualFile baseDir = project.getBaseDir();
+ if (baseDir == null) {
+ newPath = path;
+ } else {
+ projectFilePath = baseDir.getPath();
+ String filePath = path;
+ int pos = firstSeparatorIndex(filePath);
+ if (pos > -1)
+ filePath = filePath.substring(pos);
+ else
+ filePath = File.separator + filePath;
+ newPath = projectFilePath + filePath;
+ }
}
}
Modified: trunk/modules/tracklink/src/com/almworks/tracklink/filemonitoring/FileMapperImpl.java
==============================================================================
--- trunk/modules/tracklink/src/com/almworks/tracklink/filemonitoring/FileMapperImpl.java (original)
+++ trunk/modules/tracklink/src/com/almworks/tracklink/filemonitoring/FileMapperImpl.java Sat May 19 04:35:45 2007
@@ -240,8 +240,15 @@
private Project getProject() {
Project[] projects = ProjectManager.getInstance().getOpenProjects();
for (Project project : projects) {
- if (Comparing.strEqual(project.getProjectFile().getUrl(), myProjectUrl))
- return project;
+ VirtualFile baseDir = project.getBaseDir();
+ if (baseDir != null) {
+ String projectUrl = baseDir.getUrl();
+ if (projectUrl != null) {
+ if (Comparing.strEqual(projectUrl, myProjectUrl)) {
+ return project;
+ }
+ }
+ }
}
return null;
}
Modified: trunk/modules/tracklink/src/com/almworks/tracklink/filemonitoring/FileMapperManager.java
==============================================================================
--- trunk/modules/tracklink/src/com/almworks/tracklink/filemonitoring/FileMapperManager.java (original)
+++ trunk/modules/tracklink/src/com/almworks/tracklink/filemonitoring/FileMapperManager.java Sat May 19 04:35:45 2007
@@ -25,8 +25,8 @@
@NotNull
public FileMapper getFileMapper(@NotNull Project project) {
- VirtualFile projectFile = project.getProjectFile();
- String projectUrl = projectFile == null ? DEFAULT_PROJECT_URL : projectFile.getUrl();
+ VirtualFile baseDir = project.getBaseDir();
+ String projectUrl = baseDir == null ? DEFAULT_PROJECT_URL : baseDir.getUrl();
FileMapper mapper = myMap.get(projectUrl);
if (mapper == null) {
mapper = new FileMapperImpl(projectUrl);
Modified: trunk/modules/tracklink/tracklink.iml
==============================================================================
--- trunk/modules/tracklink/tracklink.iml (original)
+++ trunk/modules/tracklink/tracklink.iml Sat May 19 04:35:45 2007
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="ModuleRootManager" />
- <component inherit-compiler-output="true" name="NewModuleRootManager">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder isTestSource="false" url="file://$MODULE_DIR$/rc" />
- <sourceFolder isTestSource="false" url="file://$MODULE_DIR$/src" />
- <sourceFolder isTestSource="true" url="file://$MODULE_DIR$/tests" />
+ <sourceFolder url="file://$MODULE_DIR$/rc" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
- <orderEntry forTests="false" type="sourceFolder" />
- <orderEntry level="project" name="xmlrpc" type="library" />
- <orderEntry level="project" name="commons-codec" type="library" />
- <orderEntry exported="" level="project" name="almworks-tracker-api" type="library" />
- <orderEntry module-name="demetra" type="module" />
- <orderEntry module-name="selena" type="module" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="xmlrpc" level="project" />
+ <orderEntry type="library" name="commons-codec" level="project" />
+ <orderEntry type="library" exported="" name="almworks-tracker-api" level="project" />
+ <orderEntry type="module" module-name="demetra" />
+ <orderEntry type="module" module-name="selena" />
<orderEntryProperties />
</component>
</module>
Modified: trunk/tracklink7.ipr
==============================================================================
--- trunk/tracklink7.ipr (original)
+++ trunk/tracklink7.ipr Sat May 19 04:35:45 2007
@@ -2,19 +2,6 @@
<project relativePaths="false" version="4">
<component name="AntConfiguration">
<defaultAnt bundledAnt="true" />
- <buildFile url="file://$PROJECT_DIR$/ant/build.xml">
- <additionalClassPath>
- <entry dir="file://$PROJECT_DIR$/lib" />
- <entry dir="file://$APPLICATION_HOME_DIR$/redist" />
- <entry dir="file://$APPLICATION_HOME_DIR$/lib" />
- </additionalClassPath>
- <antReference projectDefault="true" />
- <customJdkName value="" />
- <maximumHeapSize value="128" />
- <properties>
- <property name="idea.home" value="C:/java/IDEA4155" />
- </properties>
- </buildFile>
</component>
<component name="BuildJarProjectSettings">
<option name="BUILD_JARS_ON_MAKE" value="false" />
@@ -112,7 +99,7 @@
<option name="MAXIMUM_HEAP_SIZE" value="128" />
</component>
<component name="EntryPointsManager">
- <entry_points />
+ <entry_points version="2.0" />
</component>
<component name="ExportToHTMLSettings">
<option name="PRINT_LINE_NUMBERS" value="false" />
@@ -120,13 +107,13 @@
<option name="OUTPUT_DIRECTORY" />
</component>
<component name="GUI Designer component loader factory" />
- <component IDEtalkID="3A3503F8BCEE8D1A4EE84BE1CEF54893" name="IdProvider" />
+ <component name="IdProvider" IDEtalkID="3A3503F8BCEE8D1A4EE84BE1CEF54893" />
<component name="InspectionProjectProfileManager">
<option name="PROJECT_PROFILE" value="Project Default" />
<option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
<scopes />
<profiles>
- <profile is_locked="false" version="1.0">
+ <profile version="1.0" is_locked="false">
<option name="myName" value="Project Default" />
<option name="myLocal" value="false" />
<used_levels>
@@ -190,141 +177,140 @@
</component>
<component name="Palette2">
<group name="Swing">
- <item auto-create-binding="false" can-attach-label="false" class="com.intellij.uiDesigner.HSpacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" tooltip-text="Horizontal Spacer">
- <default-constraints anchor="0" fill="1" hsize-policy="6" vsize-policy="1" />
+ <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
- <item auto-create-binding="false" can-attach-label="false" class="com.intellij.uiDesigner.VSpacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" tooltip-text="Vertical Spacer">
- <default-constraints anchor="0" fill="2" hsize-policy="1" vsize-policy="6" />
+ <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
- <item auto-create-binding="false" can-attach-label="false" class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false">
- <default-constraints anchor="0" fill="3" hsize-policy="3" vsize-policy="3" />
+ <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
- <item auto-create-binding="false" can-attach-label="true" class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false">
- <default-constraints anchor="0" fill="3" hsize-policy="7" vsize-policy="7" />
+ <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+ <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
- <item auto-create-binding="true" can-attach-label="false" class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false">
- <default-constraints anchor="0" fill="1" hsize-policy="3" vsize-policy="0" />
+ <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
- <item auto-create-binding="true" can-attach-label="false" class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false">
- <default-constraints anchor="8" fill="0" hsize-policy="3" vsize-policy="0" />
+ <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
- <item auto-create-binding="true" can-attach-label="false" class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false">
- <default-constraints anchor="8" fill="0" hsize-policy="3" vsize-policy="0" />
+ <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
- <item auto-create-binding="false" can-attach-label="false" class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false">
- <default-constraints anchor="8" fill="0" hsize-policy="0" vsize-policy="0" />
+ <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
- <item auto-create-binding="true" can-attach-label="true" class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false">
- <default-constraints anchor="8" fill="1" hsize-policy="6" vsize-policy="0">
- <preferred-size height="-1" width="150" />
+ <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
</default-constraints>
</item>
- <item auto-create-binding="true" can-attach-label="true" class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false">
- <default-constraints anchor="8" fill="1" hsize-policy="6" vsize-policy="0">
- <preferred-size height="-1" width="150" />
+ <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
</default-constraints>
</item>
- <item auto-create-binding="true" can-attach-label="true" class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false">
- <default-constraints anchor="8" fill="1" hsize-policy="6" vsize-policy="0">
- <preferred-size height="-1" width="150" />
+ <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
</default-constraints>
</item>
- <item auto-create-binding="true" can-attach-label="true" class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false">
- <default-constraints anchor="0" fill="3" hsize-policy="6" vsize-policy="6">
- <preferred-size height="50" width="150" />
+ <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item auto-create-binding="true" can-attach-label="true" class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false">
- <default-constraints anchor="0" fill="3" hsize-policy="6" vsize-policy="6">
- <preferred-size height="50" width="150" />
+ <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item auto-create-binding="true" can-attach-label="true" class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false">
- <default-constraints anchor="0" fill="3" hsize-policy="6" vsize-policy="6">
- <preferred-size height="50" width="150" />
+ <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item auto-create-binding="true" can-attach-label="true" class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false">
- <default-constraints anchor="8" fill="1" hsize-policy="2" vsize-policy="0" />
+ <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
- <item auto-create-binding="true" can-attach-label="false" class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false">
- <default-constraints anchor="0" fill="3" hsize-policy="6" vsize-policy="6">
- <preferred-size height="50" width="150" />
+ <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item auto-create-binding="true" can-attach-label="false" class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false">
- <default-constraints anchor="0" fill="3" hsize-policy="2" vsize-policy="6">
- <preferred-size height="50" width="150" />
+ <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item auto-create-binding="true" can-attach-label="false" class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false">
- <default-constraints anchor="0" fill="3" hsize-policy="6" vsize-policy="6">
- <preferred-size height="50" width="150" />
+ <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item auto-create-binding="true" can-attach-label="false" class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false">
- <default-constraints anchor="0" fill="3" hsize-policy="3" vsize-policy="3">
- <preferred-size height="200" width="200" />
+ <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
</default-constraints>
</item>
- <item auto-create-binding="false" can-attach-label="false" class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false">
- <default-constraints anchor="0" fill="3" hsize-policy="3" vsize-policy="3">
- <preferred-size height="200" width="200" />
+ <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
</default-constraints>
</item>
- <item auto-create-binding="true" can-attach-label="true" class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false">
- <default-constraints anchor="8" fill="1" hsize-policy="6" vsize-policy="0" />
+ <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
- <item auto-create-binding="true" can-attach-label="false" class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false">
- <default-constraints anchor="8" fill="1" hsize-policy="6" vsize-policy="0" />
+ <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
- <item auto-create-binding="false" can-attach-label="false" class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false">
- <default-constraints anchor="0" fill="3" hsize-policy="6" vsize-policy="6" />
+ <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
- <item auto-create-binding="true" can-attach-label="false" class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false">
- <default-constraints anchor="0" fill="1" hsize-policy="6" vsize-policy="0" />
+ <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
- <item auto-create-binding="false" can-attach-label="false" class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false">
- <default-constraints anchor="0" fill="1" hsize-policy="6" vsize-policy="0">
- <preferred-size height="20" width="-1" />
+ <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+ <preferred-size width="-1" height="20" />
</default-constraints>
</item>
- <item auto-create-binding="false" can-attach-label="false" class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false">
- <default-constraints anchor="0" fill="1" hsize-policy="0" vsize-policy="0" />
+ <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
- <item auto-create-binding="true" can-attach-label="false" class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false">
- <default-constraints anchor="0" fill="2" hsize-policy="0" vsize-policy="6" />
+ <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
</component>
<component name="ProjectModuleManager">
<modules>
- <module filepath="$PROJECT_DIR$/modules/plugin/plugin.iml" fileurl="file://$PROJECT_DIR$/modules/plugin/plugin.iml" />
- <module filepath="$PROJECT_DIR$/modules/selena/selena.iml" fileurl="file://$PROJECT_DIR$/modules/selena/selena.iml" />
- <module filepath="$PROJECT_DIR$/modules/tracklink/tracklink.iml" fileurl="file://$PROJECT_DIR$/modules/tracklink/tracklink.iml" />
+ <module fileurl="file://$PROJECT_DIR$/modules/plugin/plugin.iml" filepath="$PROJECT_DIR$/modules/plugin/plugin.iml" />
+ <module fileurl="file://$PROJECT_DIR$/modules/selena/selena.iml" filepath="$PROJECT_DIR$/modules/selena/selena.iml" />
+ <module fileurl="file://$PROJECT_DIR$/modules/tracklink/tracklink.iml" filepath="$PROJECT_DIR$/modules/tracklink/tracklink.iml" />
</modules>
</component>
- <component assert-keyword="true" jdk-15="true" name="ProjectRootManager" project-jdk-name="IDEA 6700" project-jdk-type="IDEA JDK" version="2">
+ <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="idea7" project-jdk-type="IDEA JDK">
<output url="file://$PROJECT_DIR$/build.idea" />
</component>
<component name="ProjectRunConfigurationManager">
- <configuration default="false" factoryName="Plugin" name="Tracklink" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType">
+ <configuration default="false" name="Tracklink" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
<module name="plugin" />
- <option name="VM_PARAMETERS" value="-Didea.fatal.error.notification=enable -agentlib:yjpagent -Xmx128m -XX:MaxPermSize=99m" />
+ <option name="VM_PARAMETERS" value="-Didea.fatal.error.notification=enable -Xmx128m -XX:MaxPermSize=99m" />
<option name="PROGRAM_PARAMETERS" value="" />
- <log_file alias="IDEA LOG" checked="true" path="C:/Documents and Settings/sereda/.IntelliJIdea70/sandbox/system/log/idea.log" show_all="false" skipped="true" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="2507" />
<option name="TRANSPORT" value="0" />
@@ -360,6 +346,10 @@
<option name="ADDITIONAL_OPTIONS_STRING" value="" />
</component>
<component name="StarteamVcsAdapter" />
+ <component name="SvnBranchConfigurationManager" />
+ <component name="TeamCityRootDirectoryHolder">
+ <option name="myRelativeRootDirectory" />
+ </component>
<component name="TrackLinkPlugin">
<linkType pattern="#(\d+)\b" url="http://bugzilla/main/show_bug.cgi?id=$1" />
<checkinOptions allowMultiline="true" includeSummary="true" maximumColumns="80" replaceUserComment="true" />
@@ -400,11 +390,6 @@
<SOURCES />
</library>
</component>
- <component name="uidesigner-configuration">
- <option name="INSTRUMENT_CLASSES" value="true" />
- <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" />
- <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" />
- </component>
- <UsedPathMacros />
+ <component name="uidesigner-configuration" />
</project>