Can somebody help me?
svn patch file content:
Index: src/com/fr/chart/axis/AxisStyleObject.java
===================================================================
--- src/com/fr/chart/axis/AxisStyleObject.java (revision 72672)
+++ src/com/fr/chart/axis/AxisStyleObject.java (working copy)
@@ -1,6 +1,5 @@
package com.fr.chart.axis;
-import com.fr.base.Nameable;
/**
* Created by IntelliJ IDEA.
Index: src/com/fr/chart/axis/SecondValueAxisPane.java
===================================================================
--- src/com/fr/chart/axis/SecondValueAxisPane.java (revision 72672)
+++ src/com/fr/chart/axis/SecondValueAxisPane.java (working copy)
@@ -1,10 +1,11 @@
package com.fr.chart.axis;
+import javax.swing.JCheckBox;
+import javax.swing.JPanel;
+
import com.fr.base.Inter;
import com.fr.chart.plot.axis.ValueAxis;
-import javax.swing.*;
-
/**
* Created by IntelliJ IDEA.
* Author : Richer
Index: src/com/fr/chart/axis/AxisStylePane.java
===================================================================
--- src/com/fr/chart/axis/AxisStylePane.java (revision 72672)
+++ src/com/fr/chart/axis/AxisStylePane.java (working copy)
@@ -1,7 +1,6 @@
package com.fr.chart.axis;
import com.fr.base.Inter;
-import com.fr.chart.plot.Plot;
import com.fr.dialog.BasicPane;
public abstract class AxisStylePane<T> extends BasicPane {
Index: src/com/fr/chart/axis/TernaryChartStyleAxisPane.java
===================================================================
--- src/com/fr/chart/axis/TernaryChartStyleAxisPane.java (revision
72672)
+++ src/com/fr/chart/axis/TernaryChartStyleAxisPane.java (working
copy)
@@ -1,6 +1,5 @@
package com.fr.chart.axis;
-import com.fr.chart.plot.CustomPlot;
import com.fr.chart.plot.Plot;
/**
Index: src/com/fr/chart/ChartAxisFactory.java
===================================================================
--- src/com/fr/chart/ChartAxisFactory.java (revision 72672)
+++ src/com/fr/chart/ChartAxisFactory.java (working copy)
@@ -1,15 +1,21 @@
package com.fr.chart;
+import java.util.HashMap;
+import java.util.Map;
+
import com.fr.base.FRContext;
-import com.fr.chart.axis.*;
+import com.fr.base.core.ComparatorUtils;
+import com.fr.chart.axis.AxisStylePane;
+import com.fr.chart.axis.CategoryAxisPane;
+import com.fr.chart.axis.PercentValueAxisPane;
+import com.fr.chart.axis.RadarAxisPane;
+import com.fr.chart.axis.SecondValueAxisPane;
+import com.fr.chart.axis.ValueAxisPane;
import com.fr.chart.plot.axis.Axis;
import com.fr.chart.plot.axis.CategoryAxis;
import com.fr.chart.plot.axis.RadarAxis;
import com.fr.chart.plot.axis.ValueAxis;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* Created by IntelliJ IDEA.
* Author : Richer
@@ -19,6 +25,7 @@
*/
public class ChartAxisFactory {
private static final String PERCENT = "Percent";
+ private static final String SECOND = "Second";
private static Map<String, Class<? extends AxisStylePane>> map =
new HashMap<String, Class<? extends AxisStylePane>>();
@@ -27,15 +34,18 @@
map.put(RadarAxis.class.getName(), RadarAxisPane.class);
map.put(CategoryAxis.class.getName(),
CategoryAxisPane.class);
map.put(ValueAxis.class.getName() + PERCENT,
PercentValueAxisPane.class);
+ map.put(ValueAxis.class.getName() + SECOND,
SecondValueAxisPane.class);
}
private ChartAxisFactory() {
}
- public static AxisStylePane createAxisStylePane(Axis axis) {
+ public static AxisStylePane createAxisStylePane(Axis axis, String
axisType) {
String clsName = axis.getClass().getName();
if (axis.isPercentage()) {
clsName += PERCENT;
+ } else if(ComparatorUtils.equals(axisType, "secondAxis")) {
+ clsName += SECOND;
}
Class<? extends AxisStylePane> cls = map.get(clsName);
try {
Index: src/com/fr/chart/gui/PlotContainer.java
===================================================================
--- src/com/fr/chart/gui/PlotContainer.java (revision 72672)
+++ src/com/fr/chart/gui/PlotContainer.java (working copy)
@@ -174,9 +174,9 @@
public AbstractPlotSeriesPane getSeriesPane(LinePlot plot) {
if (plot.isStacked()) {
- return new LineSeriesBoxPane(false);
+ return new LineSeriesBoxPane(true);
} else {
- return new LineSeriesStylePane(false);
+ return new LineSeriesStylePane(true);
}
}
@@ -466,4 +466,4 @@
// Plan Real ChartF-Gantt-Progress ChartF-Gantt
return Inter.getLocText("ChartF-Gantt");
}
-}
\ No newline at end of file
+}
Index: src/com/fr/chart/gui/active/action/SetAxisStyleAction.java
===================================================================
--- src/com/fr/chart/gui/active/action/SetAxisStyleAction.java
(revision 72672)
+++ src/com/fr/chart/gui/active/action/SetAxisStyleAction.java
(working copy)
@@ -1,6 +1,9 @@
package com.fr.chart.gui.active.action;
+import java.awt.event.ActionEvent;
+
import com.fr.base.Inter;
+import com.fr.base.StringUtils;
import com.fr.chart.ChartAxisFactory;
import com.fr.chart.axis.AxisStylePane;
import com.fr.chart.gui.ChartComponent;
@@ -8,8 +11,6 @@
import com.fr.dialog.BasicDialog;
import com.fr.dialog.DialogActionAdapter;
-import java.awt.event.ActionEvent;
-
/**
* Created by IntelliJ IDEA.
* Author : Richer
@@ -29,8 +30,8 @@
public void showAxisStyleDialog() {
final Axis activeAxis = getActiveAxis();
- //final AxisStylePane pane =
AxisPaneInitTool.initAxisPane(activeAxis,
getActiveAxisGlyph().getAxisType());
- final AxisStylePane pane =
ChartAxisFactory.createAxisStylePane(activeAxis);
+ String axisType = getActiveAxisGlyph() == null ?
StringUtils.EMPTY : getActiveAxisGlyph().getAxisType();
+ final AxisStylePane pane =
ChartAxisFactory.createAxisStylePane(activeAxis, axisType);
if (pane == null) return;
pane.populate(activeAxis);
the error message send to my via email:
Traceback (most recent call last):
File "/usr/local/lib/python2.6/dist-packages/Django-1.3.1-py2.6.egg/
django/core/handlers/base.py", line 178, in get_response
response = middleware_method(request, response)
File "/usr/local/lib/python2.6/dist-packages/Django-1.3.1-py2.6.egg/
django/middleware/http.py", line 15, in process_response
response['Content-Length'] = str(len(response.content))
File "/usr/local/lib/python2.6/dist-packages/Djblets-0.6.16-py2.6.egg/
djblets/webapi/core.py", line 281, in _get_content
content = adapter.encode(self.api_data, request=self.request)
File "/usr/local/lib/python2.6/dist-packages/Djblets-0.6.16-py2.6.egg/
djblets/webapi/core.py", line 88, in encode
return super(JSONEncoderAdapter, self).encode(o)
File "/usr/lib/pymodules/python2.6/simplejson/encoder.py", line 214,
in encode
chunks = self.iterencode(o, _one_shot=True)
File "/usr/lib/pymodules/python2.6/simplejson/encoder.py", line 282,
in iterencode
return _iterencode(o, 0)
UnicodeDecodeError: 'utf8' codec can't decode byte 0xb0 in position
39: invalid start byte
path:/api/review-requests/481/diffs/,
GET:,
POST:,
COOKIES:{'collapsediffs': 'True', 'rbsessionid':
'9888612d3de5cc96f4b6f5f479d876fd'},
META:{'AUTH_TYPE': None,
'CONTENT_LENGTH': '1363',
'CONTENT_TYPE': 'multipart/form-data; boundary=----
WebKitFormBoundaryPcrzZzo3Tr1K0VEh',
'GATEWAY_INTERFACE': 'CGI/1.1',
'HTTP_ACCEPT': 'text/html,application/xhtml+xml,application/
xml;q=0.9,*/*;q=0.8',
'HTTP_ACCEPT_CHARSET': 'GBK,utf-8;q=0.7,*;q=0.3',
'HTTP_ACCEPT_ENCODING': 'gzip,deflate,sdch',
'HTTP_ACCEPT_LANGUAGE': 'zh-CN,zh;q=0.8',
'HTTP_CACHE_CONTROL': 'max-age=0',
'HTTP_CONNECTION': 'keep-alive',
'HTTP_CONTENT_LENGTH': '1363',
'HTTP_CONTENT_TYPE': 'multipart/form-data; boundary=----
WebKitFormBoundaryPcrzZzo3Tr1K0VEh',
'HTTP_COOKIE': 'rbsessionid=9888612d3de5cc96f4b6f5f479d876fd;
collapsediffs=True',
'HTTP_HOST': '221.6.31.106:8888',
'HTTP_ORIGIN': 'http://221.6.31.106:8888',
'HTTP_REFERER': 'http://221.6.31.106:8888/r/481/',
'HTTP_USER_AGENT': 'Mozilla/5.0 (Windows NT 5.1) AppleWebKit/535.2
(KHTML, like Gecko) Chrome/15.0.874.121 Safari/535.2',
'PATH_INFO': u'/api/review-requests/481/diffs/',
'PATH_TRANSLATED': None,
'QUERY_STRING': None,
'REMOTE_ADDR': '221.6.31.106',
'REMOTE_HOST': None,
'REMOTE_IDENT': None,
'REMOTE_USER': None,
'REQUEST_METHOD': 'POST',
'SCRIPT_NAME': '',
'SERVER_NAME': '192.168.100.121',
'SERVER_PORT': 80,
'SERVER_PROTOCOL': 'HTTP/1.1',
'SERVER_SOFTWARE': 'mod_python'}>
--
Want to help the Review Board project? Donate today at
http://www.reviewboard.org/donate/
Happy user? Let us know at http://www.reviewboard.org/users/
-~----------~----~----~----~------~----~------~--~---
To unsubscribe from this group, send email to
reviewboard+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/reviewboard?hl=en
