Navigation Menu

Skip to content

Commit

Permalink
preparing 3.3.2 release
Browse files Browse the repository at this point in the history
  • Loading branch information
Koen Deforche committed Mar 12, 2014
1 parent d4afddd commit 379be4a
Show file tree
Hide file tree
Showing 14 changed files with 156 additions and 102 deletions.
2 changes: 1 addition & 1 deletion examples/widgetgallery/src/eu/webtoolkit/jwt/examples/widgetgallery/GraphicsWidgets.java
View file
Expand Up @@ -337,7 +337,7 @@ WWidget ScatterPlotData() {
for (int column = 1; column < model.getColumnCount(); ++column) {
table.setColumnWidth(column, new WLength(90));
}
table.resize(new WLength(780), new WLength(200));
table.resize(new WLength(783), new WLength(200));
WItemDelegate delegate = new WItemDelegate(table);
delegate.setTextFormat("%.1f");
table.setItemDelegate(delegate);
Expand Down
2 changes: 1 addition & 1 deletion examples/widgetgallery/src/eu/webtoolkit/jwt/examples/widgetgallery/src.xml
View file
Expand Up @@ -3447,7 +3447,7 @@
<span class="k">for</span> <span class="o">(</span><span class="kt">int</span> <span class="n">column</span> <span class="o">=</span> <span class="mi">1</span><span class="o">;</span> <span class="n">column</span> <span class="o">&lt;</span> <span class="n">model</span><span class="o">.</span><span class="na">getColumnCount</span><span class="o">();</span> <span class="o">++</span><span class="n">column</span><span class="o">)</span> <span class="o">{</span>
<span class="n">table</span><span class="o">.</span><span class="na">setColumnWidth</span><span class="o">(</span><span class="n">column</span><span class="o">,</span> <span class="k">new</span> <span class="n">WLength</span><span class="o">(</span><span class="mi">90</span><span class="o">));</span>
<span class="o">}</span>
<span class="n">table</span><span class="o">.</span><span class="na">resize</span><span class="o">(</span><span class="k">new</span> <span class="n">WLength</span><span class="o">(</span><span class="mi">780</span><span class="o">),</span> <span class="k">new</span> <span class="n">WLength</span><span class="o">(</span><span class="mi">200</span><span class="o">));</span>
<span class="n">table</span><span class="o">.</span><span class="na">resize</span><span class="o">(</span><span class="k">new</span> <span class="n">WLength</span><span class="o">(</span><span class="mi">783</span><span class="o">),</span> <span class="k">new</span> <span class="n">WLength</span><span class="o">(</span><span class="mi">200</span><span class="o">));</span>
<span class="n">WItemDelegate</span> <span class="n">delegate</span> <span class="o">=</span> <span class="k">new</span> <span class="n">WItemDelegate</span><span class="o">(</span><span class="n">table</span><span class="o">);</span>
<span class="n">delegate</span><span class="o">.</span><span class="na">setTextFormat</span><span class="o">(</span><span class="s">&quot;%.1f&quot;</span><span class="o">);</span>
<span class="n">table</span><span class="o">.</span><span class="na">setItemDelegate</span><span class="o">(</span><span class="n">delegate</span><span class="o">);</span>
Expand Down
2 changes: 1 addition & 1 deletion overview.html
View file
Expand Up @@ -25,7 +25,7 @@ <h1>Release notes</h1>
the way you build Wt, the way you configure Wt or the Wt API and
behaviour. It also indicates the main changes from version to verison.

<h2>Release 3.3.2 (February, 2014)</h2>
<h2>Release 3.3.2 (March 12, 2014)</h2>

<p>
This release brings a few big new features, as well the usual
Expand Down
1 change: 1 addition & 0 deletions src/eu/webtoolkit/jwt/DefaultPagingBar.java
View file
Expand Up @@ -26,6 +26,7 @@ class DefaultPagingBar extends WContainerWidget {
public DefaultPagingBar(WAbstractItemView view) {
super();
this.view_ = view;
this.view_.addStyleClass("Wt-itemview-paged");
this.setStyleClass("Wt-pagingbar");
this.firstButton_ = new WPushButton(
tr("Wt.WAbstractItemView.PageBar.First"), this);
Expand Down
4 changes: 2 additions & 2 deletions src/eu/webtoolkit/jwt/StdGridLayoutImpl2.java
View file

Large diffs are not rendered by default.

15 changes: 12 additions & 3 deletions src/eu/webtoolkit/jwt/WApplication.java
View file
Expand Up @@ -1832,8 +1832,11 @@ public final void attachThread() {
* immediately. The JavaScript will be run after the normal event handling,
* unless <code>afterLoaded</code> is set to <code>false</code>.
* <p>
* In most situations, it&apos;s more robust to use
* {@link WWidget#doJavaScript(String js) WWidget#doJavaScript()} however.
* <p>
*
* @see WApplication#addAutoJavaScript(String javascript)
* @see WWidget#doJavaScript(String js)
* @see WApplication#addAutoJavaScript(String javascript)
*/
public void doJavaScript(final String javascript, boolean afterLoaded) {
Expand Down Expand Up @@ -1867,8 +1870,11 @@ public final void doJavaScript(final String javascript) {
* immediately. The JavaScript will be run after the normal event handling,
* unless <code>afterLoaded</code> is set to <code>false</code>.
* <p>
* In most situations, it&apos;s more robust to use
* {@link WWidget#doJavaScript(String js) WWidget#doJavaScript()} however.
* <p>
*
* @see WApplication#addAutoJavaScript(String javascript)
* @see WWidget#doJavaScript(String js)
* @see WApplication#addAutoJavaScript(String javascript)
*/
public void addAutoJavaScript(final String javascript) {
Expand Down Expand Up @@ -1972,8 +1978,11 @@ public boolean requireJQuery(final String uri) {
* immediately. The JavaScript will be run after the normal event handling,
* unless <code>afterLoaded</code> is set to <code>false</code>.
* <p>
* In most situations, it&apos;s more robust to use
* {@link WWidget#doJavaScript(String js) WWidget#doJavaScript()} however.
* <p>
*
* @see WApplication#addAutoJavaScript(String javascript)
* @see WWidget#doJavaScript(String js)
* @see WApplication#addAutoJavaScript(String javascript)
*/
public boolean isCustomJQuery() {
Expand Down
193 changes: 111 additions & 82 deletions src/eu/webtoolkit/jwt/chart/WAxis.java
View file
Expand Up @@ -55,8 +55,8 @@
* <p>
* The labels are shown using a &quot;%.4g&quot; format string for numbers, and
* a suitable format for {@link AxisScale#DateScale DateScale} or
* {@link AxisScale#DateTimeScale DateTimeScale} formats, which uses heuristics
* to choose a suitable format. The format may be customized using
* {@link AxisScale#DateTimeScale DateTimeScale} scales, based on heuristics.
* The format may be customized using
* {@link WAxis#setLabelFormat(CharSequence format) setLabelFormat()}. The angle
* of the label text may be changed using
* {@link WAxis#setLabelAngle(double angle) setLabelAngle()}. By default, all
Expand Down Expand Up @@ -499,8 +499,7 @@ public double getLabelInterval() {
* For an axis with a {@link AxisScale#LinearScale LinearScale} or
* {@link AxisScale#LogScale LogScale} scale, the format string must be a
* format string that is accepted by snprintf() and which formats one
* double. If the format string is an empty string, &quot;%.4g&quot; is
* used.
* double. If the format string is an empty string, then {@link } is used.
* <p>
* For an axis with a {@link AxisScale#DateScale DateScale} scale, the
* format string must be a format string accepted by
Expand All @@ -514,7 +513,9 @@ public double getLabelInterval() {
* the format string is an empty string, a suitable format is chosen based
* on heuristics.
* <p>
* The default value is an empty string (&quot;&quot;).
* The default value is &quot;%.4g&quot; for a numeric axis, and a suitable
* format for date(time) scales based on a heuristic taking into account the
* current axis range.
* <p>
*
* @see WAxis#getLabelFormat()
Expand All @@ -525,6 +526,7 @@ public void setLabelFormat(final CharSequence format) {
update();
}
;
this.defaultLabelFormat_ = false;
}

/**
Expand All @@ -534,7 +536,25 @@ public void setLabelFormat(final CharSequence format) {
* @see WAxis#setLabelFormat(CharSequence format)
*/
public WString getLabelFormat() {
return this.labelFormat_;
switch (this.scale_) {
case CategoryScale:
return new WString();
case DateScale:
case DateTimeScale:
if (this.defaultLabelFormat_) {
if (!this.segments_.isEmpty()) {
final WAxis.Segment s = this.segments_.get(0);
return this.defaultDateTimeFormat(s);
} else {
return this.labelFormat_;
}
} else {
return this.labelFormat_;
}
default:
return this.defaultLabelFormat_ ? new WString("%.4g")
: this.labelFormat_;
}
}

/**
Expand Down Expand Up @@ -775,25 +795,23 @@ public WString getLabel(double u) {
if (this.scale_ == AxisScale.CategoryScale) {
text = this.chart_.categoryLabel((int) u, this.axis_);
if ((text.length() == 0)) {
buf = String.format("%.4g", u + 1);
text = new WString(buf);
text = new WString(LocaleUtils.toString(LocaleUtils
.getCurrentLocale(), u));
}
} else {
if (this.scale_ == AxisScale.DateScale) {
WDate d = WDate.fromJulianDay((int) u);
WString format = this.labelFormat_;
if ((format.length() == 0)) {
return new WString(d.toString("dd/MM/yyyy"));
} else {
return new WString(d.toString(format.toString()));
}
WString format = this.getLabelFormat();
return new WString(d.toString(format.toString()));
} else {
String format = this.labelFormat_.toString();
String format = this.getLabelFormat().toString();
if (format.length() == 0) {
format = "%.4g";
text = new WString(LocaleUtils.toString(LocaleUtils
.getCurrentLocale(), u));
} else {
buf = String.format(format, u);
text = new WString(buf);
}
buf = String.format(format, u);
text = new WString(buf);
}
}
return text;
Expand Down Expand Up @@ -1450,6 +1468,7 @@ protected void getLabelTicks(final List<WAxis.TickLabel> ticks, int segment) {
}
case DateTimeScale:
case DateScale: {
WString format = this.getLabelFormat();
WDate dt = null;
if (this.scale_ == AxisScale.DateScale) {
dt = WDate.fromJulianDay((int) s.renderMinimum);
Expand All @@ -1467,70 +1486,6 @@ protected void getLabelTicks(final List<WAxis.TickLabel> ticks, int segment) {
|| unit.getValue() <= WAxis.DateTimeUnit.Days.getValue()
|| !!EnumUtils.mask(this.roundLimits_,
AxisValue.MinimumValue).isEmpty();
WString format = this.labelFormat_;
if ((format.length() == 0)) {
if (atTick) {
switch (unit) {
case Months:
case Years:
case Days:
if (dt.getSecond() != 0) {
format = new WString("dd/MM/yy hh:mm:ss");
} else {
if (dt.getHour() != 0) {
format = new WString("dd/MM/yy hh:mm");
} else {
format = new WString("dd/MM/yy");
}
}
break;
case Hours:
if (dt.getSecond() != 0) {
format = new WString("dd/MM hh:mm:ss");
} else {
if (dt.getMinute() != 0) {
format = new WString("dd/MM hh:mm");
} else {
format = new WString("h'h' dd/MM");
}
}
break;
case Minutes:
if (dt.getSecond() != 0) {
format = new WString("hh:mm:ss");
} else {
format = new WString("hh:mm");
}
break;
case Seconds:
format = new WString("hh:mm:ss");
break;
}
} else {
switch (unit) {
case Years:
format = new WString("yyyy");
break;
case Months:
format = new WString("MMM yy");
break;
case Days:
format = new WString("dd/MM/yy");
break;
case Hours:
format = new WString("h'h' dd/MM");
break;
case Minutes:
format = new WString("hh:mm");
break;
case Seconds:
format = new WString("hh:mm:ss");
break;
default:
break;
}
}
}
for (;;) {
long dl = this.getDateNumber(dt);
if (dl > s.renderMaximum) {
Expand Down Expand Up @@ -1596,6 +1551,7 @@ public int getValue() {
private double resolution_;
private double labelInterval_;
private WString labelFormat_;
private boolean defaultLabelFormat_;
private boolean gridLines_;
private WPen pen_;
private WPen gridLinesPen_;
Expand Down Expand Up @@ -1643,6 +1599,7 @@ public Segment() {
this.resolution_ = 0.0;
this.labelInterval_ = 0;
this.labelFormat_ = new WString();
this.defaultLabelFormat_ = true;
this.gridLines_ = false;
this.pen_ = new WPen();
this.gridLinesPen_ = new WPen(WColor.gray);
Expand Down Expand Up @@ -1871,6 +1828,78 @@ private double calcAutoNumLabels(Orientation orientation,
: AUTO_H_LABEL_PIXELS);
}

private WString defaultDateTimeFormat(final WAxis.Segment s) {
WDate dt = null;
if (this.scale_ == AxisScale.DateScale) {
dt = WDate.fromJulianDay((int) s.renderMinimum);
if (!(dt != null)) {
String exception = "Invalid julian day: "
+ String.valueOf(s.renderMinimum);
throw new WException(exception);
}
} else {
dt = new WDate(new Date((long) (long) s.renderMinimum));
}
int interval = s.dateTimeRenderInterval;
WAxis.DateTimeUnit unit = s.dateTimeRenderUnit;
boolean atTick = interval > 1
|| unit.getValue() <= WAxis.DateTimeUnit.Days.getValue()
|| !!EnumUtils.mask(this.roundLimits_, AxisValue.MinimumValue)
.isEmpty();
if (atTick) {
switch (unit) {
case Months:
case Years:
case Days:
if (dt.getSecond() != 0) {
return new WString("dd/MM/yy hh:mm:ss");
} else {
if (dt.getHour() != 0) {
return new WString("dd/MM/yy hh:mm");
} else {
return new WString("dd/MM/yy");
}
}
case Hours:
if (dt.getSecond() != 0) {
return new WString("dd/MM hh:mm:ss");
} else {
if (dt.getMinute() != 0) {
return new WString("dd/MM hh:mm");
} else {
return new WString("h'h' dd/MM");
}
}
case Minutes:
if (dt.getSecond() != 0) {
return new WString("hh:mm:ss");
} else {
return new WString("hh:mm");
}
case Seconds:
return new WString("hh:mm:ss");
}
} else {
switch (unit) {
case Years:
return new WString("yyyy");
case Months:
return new WString("MMM yy");
case Days:
return new WString("dd/MM/yy");
case Hours:
return new WString("h'h' dd/MM");
case Minutes:
return new WString("hh:mm");
case Seconds:
return new WString("hh:mm:ss");
default:
break;
}
}
return WString.Empty;
}

double mapFromDevice(double d) {
for (int i = 0; i < this.segments_.size(); ++i) {
final WAxis.Segment s = this.segments_.get(i);
Expand Down
2 changes: 1 addition & 1 deletion src/eu/webtoolkit/jwt/render/Css21Lexer.java
View file
@@ -1,4 +1,4 @@
// $ANTLR 3.5 src/eu/webtoolkit/jwt/render/Css21.g 2014-03-10 11:55:30
// $ANTLR 3.5 src/eu/webtoolkit/jwt/render/Css21.g 2014-03-12 17:03:45
package eu.webtoolkit.jwt.render;

import org.antlr.runtime.*;
Expand Down
2 changes: 1 addition & 1 deletion src/eu/webtoolkit/jwt/render/Css21Parser.java
View file
@@ -1,4 +1,4 @@
// $ANTLR 3.5 src/eu/webtoolkit/jwt/render/Css21.g 2014-03-10 11:55:29
// $ANTLR 3.5 src/eu/webtoolkit/jwt/render/Css21.g 2014-03-12 17:03:45
package eu.webtoolkit.jwt.render;

import org.antlr.runtime.*;
Expand Down
4 changes: 4 additions & 0 deletions src/eu/webtoolkit/jwt/utils/LocaleUtils.java
View file
Expand Up @@ -64,5 +64,9 @@ public static String toFixedString(Locale locale, double value, int precision) {

public static String toString(Locale locale, int value) {
return NumberFormat.getInstance(locale).format(value);
}

public static String toString(Locale locale, double value) {
return NumberFormat.getInstance(locale).format(value);
}
}
4 changes: 3 additions & 1 deletion src/eu/webtoolkit/jwt/wt-resources/themes/bootstrap/2/wt.css
View file
Expand Up @@ -544,7 +544,6 @@
white-space: nowrap;
background: white;
border: 1px solid #dddddd;
overflow: auto;
/* header */

/* resize handles */
Expand All @@ -554,6 +553,9 @@
/* item drag & drop */

}
.Wt-itemview.Wt-itemview-paged {
overflow: auto;
}
.Wt-itemview .Wt-spacer {
background: url(../../../loading.png);
}
Expand Down

0 comments on commit 379be4a

Please sign in to comment.