MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

bundle testng 6.4

Browse Source
This commit is contained in:
anna
2012-02-14 20:28:52 +01:00
parent b8d70ff460
commit 06410bffd5
6 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.form
+30 -9
View File
@@ -3,7 +3,7 @@
<grid id="8cf0d" binding="myPanel" layout-manager="GridLayoutManager" row-count="6" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<xy x="18" y="29" width="514" height="528"/>
<xy x="18" y="29" width="514" height="536"/>
</constraints>
<properties/>
<border type="none"/>
@@ -155,7 +155,7 @@
</grid>
<grid id="81c32" binding="myMembersPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<grid row="0" column="1" row-span="4" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="3" indent="0" use-parent-layout="false"/>
<grid row="0" column="1" row-span="5" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<clientProperties>
@@ -235,20 +235,41 @@
</grid>
<component id="be81b" class="javax.swing.JCheckBox" binding="myCbUseExternalAnnotations">
<constraints>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/ApplicationBundle" key="use.external.annotations"/>
</properties>
</component>
<component id="95854" class="javax.swing.JCheckBox" binding="myInsertOverrideAnnotationCheckBox" default-binding="true">
<grid id="6fb9a" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/ApplicationBundle" key="insert.override.annotation"/>
</properties>
</component>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldSmallWithIndent"/>
</clientProperties>
<border type="etched" title="Override method signature"/>
<children>
<component id="95854" class="javax.swing.JCheckBox" binding="myInsertOverrideAnnotationCheckBox" default-binding="true">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/ApplicationBundle" key="insert.override.annotation"/>
</properties>
</component>
<component id="9c14a" class="javax.swing.JCheckBox" binding="myRepeatSynchronizedCheckBox" default-binding="true">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Repeat &amp;synchronized modifier"/>
</properties>
</component>
</children>
</grid>
</children>
</grid>
</form>
java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.java
+4
View File
@@ -54,6 +54,7 @@ public class CodeStyleGenerationConfigurable implements Configurable {
private JCheckBox myCbUseExternalAnnotations;
private JCheckBox myInsertOverrideAnnotationCheckBox;
private JPanel myMembersPanel;
private JCheckBox myRepeatSynchronizedCheckBox;
public CodeStyleGenerationConfigurable(CodeStyleSettings settings) {
mySettings = settings;
@@ -226,6 +227,7 @@ public class CodeStyleGenerationConfigurable implements Configurable {
myCbUseExternalAnnotations.setSelected(settings.USE_EXTERNAL_ANNOTATIONS);
myInsertOverrideAnnotationCheckBox.setSelected(settings.INSERT_OVERRIDE_ANNOTATION);
myRepeatSynchronizedCheckBox.setSelected(settings.REPEAT_SYNCHRONIZED);
}
public void reset() {
@@ -253,6 +255,7 @@ public class CodeStyleGenerationConfigurable implements Configurable {
settings.USE_EXTERNAL_ANNOTATIONS = myCbUseExternalAnnotations.isSelected();
settings.INSERT_OVERRIDE_ANNOTATION = myInsertOverrideAnnotationCheckBox.isSelected();
settings.REPEAT_SYNCHRONIZED = myRepeatSynchronizedCheckBox.isSelected();
myMembersOrderList.apply(settings);
@@ -287,6 +290,7 @@ public class CodeStyleGenerationConfigurable implements Configurable {
isModified |= isModified(myCbUseExternalAnnotations, settings.USE_EXTERNAL_ANNOTATIONS);
isModified |= isModified(myInsertOverrideAnnotationCheckBox, settings.INSERT_OVERRIDE_ANNOTATION);
isModified |= isModified(myRepeatSynchronizedCheckBox, settings.REPEAT_SYNCHRONIZED);
isModified |= myMembersOrderList.isModified(settings);
java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java
+4
View File
@@ -305,6 +305,10 @@ public class OverrideImplementUtil {
}
annotateOnOverrideImplement(result, aClass, method, insertOverrideIfPossible);
if (CodeStyleSettingsManager.getSettings(aClass.getProject()).REPEAT_SYNCHRONIZED && method.hasModifierProperty(PsiModifier.SYNCHRONIZED)) {
result.getModifierList().setModifierProperty(PsiModifier.SYNCHRONIZED, true);
}
final PsiCodeBlock body = JavaPsiFacade.getInstance(method.getProject()).getElementFactory().createCodeBlockFromText("{}", null);
PsiCodeBlock oldbody = result.getBody();