MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 06:39:38 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-261058 i18n: Preferences/Settings: Tools: Tasks: Servers: Translation is not shown on UI

Browse Source 
GitOrigin-RevId: 17d52a3cb6dd27d630c46e90cae5ca4d6ff034c5
This commit is contained in:
Alexander Lobas
2021-02-03 20:38:45 +03:00
committed by intellij-monorepo-bot
parent 37b89b43ae
commit d9003aea17
12 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java
View File

@@ -461,7 +461,7 @@ public class AsmCodeGenerator {
if (lwComponent instanceof LwNestedForm) {
componentLocal = getNestedFormComponent(generator, componentClass, componentLocal);
}
parentCodeGenerator.generateComponentLayout(lwComponent, generator, componentLocal, parentLocal);
parentCodeGenerator.generateComponentLayout(lwComponent, generator, componentLocal, parentLocal, myClassName);
}
if (lwComponent instanceof LwContainer) {

5
java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/CardLayoutCodeGenerator.java
View File

@@ -38,8 +38,9 @@ public class CardLayoutCodeGenerator extends SimpleLayoutCodeGenerator {
public void generateComponentLayout(LwComponent lwComponent,
GeneratorAdapter generator,
int componentLocal,
int parentLocal) {
super.generateComponentLayout(lwComponent, generator, componentLocal, parentLocal);
int parentLocal,
String formClassName) {
super.generateComponentLayout(lwComponent, generator, componentLocal, parentLocal, formClassName);
String defaultCard = (String)lwComponent.getParent().getClientProperty(UIFormXmlConstants.LAYOUT_CARD);
if (lwComponent.getId().equals(defaultCard)) {

3
java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/FlowLayoutCodeGenerator.java
View File

@@ -49,7 +49,8 @@ public class FlowLayoutCodeGenerator extends LayoutCodeGenerator {
public void generateComponentLayout(final LwComponent lwComponent,
final GeneratorAdapter generator,
final int componentLocal,
final int parentLocal) {
final int parentLocal,
final String formClassName) {
generator.loadLocal(parentLocal);
generator.loadLocal(componentLocal);
generator.invokeVirtual(ourContainerType, ourAddNoConstraintMethod);

2
java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/FormLayoutCodeGenerator.java
View File

@@ -87,7 +87,7 @@ public class FormLayoutCodeGenerator extends LayoutCodeGenerator {
}
@Override
public void generateComponentLayout(final LwComponent lwComponent, final GeneratorAdapter generator, final int componentLocal, final int parentLocal) {
public void generateComponentLayout(final LwComponent lwComponent, final GeneratorAdapter generator, final int componentLocal, final int parentLocal, final String formClassName) {
generator.loadLocal(parentLocal);
generator.loadLocal(componentLocal);
addNewCellConstraints(generator, lwComponent);

3
java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/GridBagLayoutCodeGenerator.java
View File

@@ -70,7 +70,8 @@ public class GridBagLayoutCodeGenerator extends LayoutCodeGenerator {
public void generateComponentLayout(final LwComponent component,
final GeneratorAdapter generator,
final int componentLocal,
final int parentLocal) {
final int parentLocal,
final String formClassName) {
GridBagConstraints gbc;
if (component.getCustomLayoutConstraints() instanceof GridBagConstraints) {
gbc = (GridBagConstraints) component.getCustomLayoutConstraints();

3
java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/GridLayoutCodeGenerator.java
View File

@@ -65,7 +65,8 @@ public class GridLayoutCodeGenerator extends LayoutCodeGenerator {
public void generateComponentLayout(final LwComponent lwComponent,
final GeneratorAdapter generator,
final int componentLocal,
final int parentLocal) {
final int parentLocal,
final String formClassName) {
generator.loadLocal(parentLocal);
generator.loadLocal(componentLocal);
addNewGridConstraints(generator, lwComponent);

2
java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/LayoutCodeGenerator.java
View File

@@ -38,7 +38,7 @@ public abstract class LayoutCodeGenerator {
}
public abstract void generateComponentLayout(final LwComponent lwComponent, final GeneratorAdapter generator, final int componentLocal,
final int parentLocal);
final int parentLocal, final String formClassName);
protected static void newDimensionOrNull(final GeneratorAdapter generator, final Dimension dimension) {
if (dimension.width == -1 && dimension.height == -1) {

3
java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/ScrollPaneLayoutCodeGenerator.java
View File

@@ -34,7 +34,8 @@ public class ScrollPaneLayoutCodeGenerator extends LayoutCodeGenerator {
public void generateComponentLayout(final LwComponent lwComponent,
final GeneratorAdapter generator,
final int componentLocal,
final int parentLocal) {
final int parentLocal,
final String formClassName) {
generator.loadLocal(parentLocal);
generator.loadLocal(componentLocal);
generator.invokeVirtual(myScrollPaneType, mySetViewportViewMethod);

3
java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/SimpleLayoutCodeGenerator.java
View File

@@ -53,7 +53,8 @@ public class SimpleLayoutCodeGenerator extends LayoutCodeGenerator {
public void generateComponentLayout(final LwComponent lwComponent,
final GeneratorAdapter generator,
final int componentLocal,
final int parentLocal) {
final int parentLocal,
final String formClassName) {
generator.loadLocal(parentLocal);
generator.loadLocal(componentLocal);
generator.push((String) lwComponent.getCustomLayoutConstraints());

3
java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/SplitPaneLayoutCodeGenerator.java
View File

@@ -35,7 +35,8 @@ public class SplitPaneLayoutCodeGenerator extends LayoutCodeGenerator {
public void generateComponentLayout(final LwComponent lwComponent,
final GeneratorAdapter generator,
final int componentLocal,
final int parentLocal) {
final int parentLocal,
final String formClassName) {
generator.loadLocal(parentLocal);
generator.loadLocal(componentLocal);
if (LwSplitPane.POSITION_LEFT.equals(lwComponent.getCustomLayoutConstraints())) {

5
java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/TabbedPaneLayoutCodeGenerator.java
View File

@@ -36,12 +36,14 @@ public class TabbedPaneLayoutCodeGenerator extends LayoutCodeGenerator {
public void generateComponentLayout(final LwComponent lwComponent,
final GeneratorAdapter generator,
final int componentLocal,
final int parentLocal) {
final int parentLocal,
final String formClassName) {
generator.loadLocal(parentLocal);
final LwTabbedPane.Constraints tabConstraints = (LwTabbedPane.Constraints)lwComponent.getCustomLayoutConstraints();
if (tabConstraints == null){
throw new IllegalArgumentException("tab constraints cannot be null: " + lwComponent.getId());
}
tabConstraints.myTitle.setFormClass(formClassName);
AsmCodeGenerator.pushPropValue(generator, String.class.getName(), tabConstraints.myTitle);
if (tabConstraints.myIcon == null) {
generator.push((String) null);
@@ -54,6 +56,7 @@ public class TabbedPaneLayoutCodeGenerator extends LayoutCodeGenerator {
generator.push((String) null);
}
else {
tabConstraints.myToolTip.setFormClass(formClassName);
AsmCodeGenerator.pushPropValue(generator, String.class.getName(), tabConstraints.myToolTip);
}
generator.invokeVirtual(myTabbedPaneType, myAddTabMethod);

3
java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/ToolBarLayoutCodeGenerator.java
View File

@@ -30,7 +30,8 @@ public class ToolBarLayoutCodeGenerator extends LayoutCodeGenerator {
public void generateComponentLayout(final LwComponent lwComponent,
final GeneratorAdapter generator,
final int componentLocal,
final int parentLocal) {
final int parentLocal,
final String formClassName) {
generator.loadLocal(parentLocal);
generator.loadLocal(componentLocal);
generator.invokeVirtual(ourContainerType, ourAddMethod);