Browse Source

Merging in latest from upstream (CHART/design:refs/heads/release/9.0)

* commit 'b02d03f3c6fd8fe6b744e278af08cc6e4783b913':
  PFC-1053
master
zheng 7 years ago
parent
commit
458c1b6e58
  1. 2
      designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java
  2. 2
      designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java
  3. 2
      designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java
  4. 2
      designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java
  5. 2
      designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java
  6. 2
      designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java
  7. 2
      designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
  8. 2
      designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java

2
designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java

@ -75,7 +75,7 @@ public class ReportletHyperlinkPane extends BasicBeanPane<ReportletHyperlink> {
} }
protected boolean needRenamePane(){ protected boolean needRenamePane(){
return plot != null && plot.needRenameHyperLinkPane(); return plot != null && plot.isNeedRenameHyperLinkPane();
} }
@Override @Override

2
designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java

@ -73,7 +73,7 @@ public class WebHyperlinkPane extends BasicBeanPane<WebHyperlink> {
} }
protected boolean needRenamePane(){ protected boolean needRenamePane(){
return plot != null && plot.needRenameHyperLinkPane(); return plot != null && plot.isNeedRenameHyperLinkPane();
} }
@Override @Override

2
designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java

@ -118,7 +118,7 @@ public class JavaScriptImplPane extends FurtherBasicBeanPane<JavaScriptImpl> {
} }
protected boolean needRenamePane(){ protected boolean needRenamePane(){
return plot != null && plot.needRenameHyperLinkPane(); return plot != null && plot.isNeedRenameHyperLinkPane();
} }
/** /**

2
designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java

@ -49,7 +49,7 @@ public class ParameterJavaScriptPane extends BasicBeanPane<ParameterJavaScript>
} }
protected boolean needRenamePane(){ protected boolean needRenamePane(){
return plot != null && plot.needRenameHyperLinkPane(); return plot != null && plot.isNeedRenameHyperLinkPane();
} }
@Override @Override

2
designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java

@ -96,7 +96,7 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
} }
protected boolean needRenamePane(){ protected boolean needRenamePane(){
return plot != null && plot.needRenameHyperLinkPane(); return plot != null && plot.isNeedRenameHyperLinkPane();
} }
@Override @Override

2
designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java

@ -77,7 +77,7 @@ public class ChartHyperRelateCellLinkPane extends BasicBeanPane<ChartHyperRelate
} }
protected boolean needRenamePane(){ protected boolean needRenamePane(){
return plot != null && plot.needRenameHyperLinkPane(); return plot != null && plot.isNeedRenameHyperLinkPane();
} }
@Override @Override

2
designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java

@ -95,7 +95,7 @@ public class ChartHyperRelateFloatLinkPane extends BasicBeanPane<ChartHyperRelat
} }
protected boolean needRenamePane(){ protected boolean needRenamePane(){
return plot != null && plot.needRenameHyperLinkPane(); return plot != null && plot.isNeedRenameHyperLinkPane();
} }
private String[] getFloatNames() { private String[] getFloatNames() {

2
designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java

@ -64,7 +64,7 @@ public class FormHyperlinkPane extends BasicBeanPane<FormHyperlinkProvider> {
} }
protected boolean needRenamePane(){ protected boolean needRenamePane(){
return plot != null && plot.needRenameHyperLinkPane(); return plot != null && plot.isNeedRenameHyperLinkPane();
} }
protected int getHyperlinkType() { protected int getHyperlinkType() {

Loading…
Cancel
Save