s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into internationalization

Browse Source 
Conflicts:
	extensions/freebase/module/scripts/dialogs/schema-alignment/schema-alignment-dialog.html
	main/webapp/modules/core/index.vt
	main/webapp/modules/core/project.vt
	main/webapp/modules/core/scripts/project/browsing-engine.js
	main/webapp/modules/core/scripts/project/history-panel.html
This commit is contained in:
Blakko 2013-07-25 11:07:59 +02:00
commit 6e90bc41f6
25 changed files with 43 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.classpath
View File

@ -13,7 +13,7 @@
<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/arithcode-1.1.jar"/>
<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/butterfly-trunk.jar" sourcepath="main/webapp/WEB-INF/lib-src/butterfly-trunk-sources.jar"/>
<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/clojure-1.4.0.jar"/>
<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/commons-codec-1.5.jar"/>
<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/commons-codec-1.6.jar"/>
<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/commons-collections-3.2.1.jar"/>
<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/commons-fileupload-1.2.1.jar"/>
<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/commons-io-1.4.jar"/>
@ -42,7 +42,7 @@
<classpathentry exported="true" kind="lib" path="server/lib/jetty-6.1.22.jar" sourcepath="server/lib-src/jetty-6.1.22-sources.jar"/>
<classpathentry exported="true" kind="lib" path="server/lib/jetty-util-6.1.22.jar" sourcepath="server/lib-src/jetty-util-6.1.22-sources.jar"/>
<classpathentry exported="true" kind="lib" path="server/lib/log4j-1.2.15.jar"/>
<classpathentry exported="true" kind="lib" path="server/lib/servlet-api-2.5.jar"/>
<classpathentry exported="true" kind="lib" path="server/lib/servlet-api-2.5.jar" sourcepath="server/lib-src/servlet-api-2.5-sources.jar"/>
<classpathentry exported="true" kind="lib" path="server/lib/slf4j-api-1.5.6.jar"/>
<classpathentry exported="true" kind="lib" path="server/lib/slf4j-log4j12-1.5.6.jar"/>
<classpathentry exported="true" kind="lib" path="broker/appengine/WEB-INF/lib/slf4j-jdk14-1.5.6.jar"/>
@ -66,8 +66,8 @@
<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/serializer.jar"/>
<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/xercesImpl-2.11.jar"/>
<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/xml-apis.jar"/>
<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/httpclient-4.1.2.jar" sourcepath="main/webapp/WEB-INF/lib-src/httpclient-4.1.2-sources.jar"/>
<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/httpcore-4.1.3.jar" sourcepath="main/webapp/WEB-INF/lib-src/httpcore-4.1.3-sources.jar"/>
<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/httpclient-4.2.5.jar"/>
<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/httpcore-4.2.4.jar"/>
<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/signpost-commonshttp4-1.2.1.2.jar" sourcepath="main/webapp/WEB-INF/lib-src/signpost-commonshttp4-1.2.1.2-sources.jar"/>
<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/signpost-core-1.2.1.2.jar" sourcepath="main/webapp/WEB-INF/lib-src/signpost-core-1.2.1.2-sources.jar"/>
<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/guava-13.0.jar"/>
@ -76,5 +76,8 @@
<classpathentry exported="true" kind="lib" path="extensions/freebase/module/MOD-INF/lib/google-api-services-freebase-v1-rev25-1.13.2-beta.jar" sourcepath="extensions/freebase/module/MOD-INF/libsrc/google-api-services-freebase-v1-rev25-1.13.2-beta-sources.jar"/>
<classpathentry exported="true" kind="lib" path="extensions/freebase/module/MOD-INF/lib/google-http-client-jackson-1.13.1-beta.jar"/>
<classpathentry exported="true" kind="lib" path="extensions/freebase/module/MOD-INF/lib/mail.jar"/>
<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/commons-logging-1.1.1.jar"/>
<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/fluent-hc-4.2.5.jar"/>
<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/httpmime-4.2.5.jar"/>
<classpathentry kind="output" path="build"/>
</classpath>

2
build.xml
View File

@ -139,7 +139,7 @@
<copy file="${webapp.src.dir}/log4j.properties" tofile="${webapp.classes.dir}/log4j.properties"/>
</target>
<target name="build_tests" depends="build_webapp, build_server">
<target name="build_tests" depends="build">
<mkdir dir="${server.tests.classes.dir}" />
<javac source="${java_version}" target="${java_version}" encoding="utf-8" srcdir="${server.tests.src.dir}" destdir="${server.tests.classes.dir}" debug="true" includeAntRuntime="no">
<classpath refid="tests.class.path" />

2
extensions/freebase/build.xml
View File

@ -57,7 +57,7 @@
<target name="build_java">
<mkdir dir="${classes.dir}" />
<javac encoding="utf-8" destdir="${classes.dir}" debug="true" includeAntRuntime="no">
<javac source="${java_version}" target="${java_version}" encoding="utf-8" destdir="${classes.dir}" debug="true" includeAntRuntime="no">
<src path="${src.dir}"/>
<classpath refid="class.path" />
</javac>

2
extensions/freebase/module/scripts/dialogs/schema-alignment/schema-alignment-dialog.html
View File

@ -2,7 +2,7 @@
<div class="dialog-header" bind="dialogHeader"></div>
<div class="dialog-body" bind="dialogBody">
<p class="body-text" bind="body_text">
<a href="http://code.google.com/p/google-refine/wiki/SchemaAlignment" target="_blank" bind="find_more"></a>
<a href="http://github.com/OpenRefine/OpenRefine/wiki/SchemaAlignment" target="_blank" bind="find_more"></a>
</p>
<div id="schema-alignment-tabs" class="refine-tabs">
<ul>

6
extensions/gdata/build.xml
View File

@ -2,8 +2,8 @@
<!--+
|
| OpenRefine GData Extension Build File
|
| OpenRefine GData Extension Build File
|
+-->
<project name="grefine-gdata-extension" default="build" basedir=".">
@ -50,7 +50,7 @@
<target name="build_java">
<mkdir dir="${classes.dir}" />
<javac encoding="utf-8" destdir="${classes.dir}" debug="true" includeAntRuntime="no">
<javac source="${java_version}" target="${java_version}" encoding="utf-8" destdir="${classes.dir}" debug="true" includeAntRuntime="no">
<src path="${src.dir}"/>
<classpath refid="class.path" />
</javac>

2
extensions/jython/build.xml
View File

@ -52,7 +52,7 @@
<target name="build_java">
<mkdir dir="${classes.dir}" />
<javac encoding="utf-8" destdir="${classes.dir}" debug="true" includeAntRuntime="no">
<javac source="${java_version}" target="${java_version}" encoding="utf-8" destdir="${classes.dir}" debug="true" includeAntRuntime="no">
<src path="${src.dir}"/>
<classpath refid="class.path" />
</javac>

2
extensions/pc-axis/build.xml
View File

@ -53,7 +53,7 @@
<target name="build_java">
<mkdir dir="${classes.dir}" />
<javac encoding="utf-8" destdir="${classes.dir}" debug="true" includeAntRuntime="no">
<javac source="${java_version}" target="${java_version}" encoding="utf-8" destdir="${classes.dir}" debug="true" includeAntRuntime="no">
<src path="${src.dir}"/>
<classpath refid="class.path" />
</javac>

2
extensions/sample/build.xml
View File

@ -57,7 +57,7 @@
<target name="build_java">
<mkdir dir="${classes.dir}" />
<javac encoding="utf-8" destdir="${classes.dir}" debug="true" includeAntRuntime="no">
<javac source="${java_version}" target="${java_version}" encoding="utf-8" destdir="${classes.dir}" debug="true" includeAntRuntime="no">
<src path="${src.dir}"/>
<classpath refid="class.path" />
</javac>

1
main/src/com/google/refine/model/recon/ReconConfig.java
View File

@ -90,6 +90,7 @@ abstract public class ReconConfig implements Jsonizable {
mode = "core/" + mode;
}
// TODO: This can fail silently if the Freebase extension is not installed.
List<Class<? extends ReconConfig>> classes = s_opNameToClass.get(mode);
if (classes != null && classes.size() > 0) {
Class<? extends ReconConfig> klass = classes.get(classes.size() - 1);

4
main/src/com/google/refine/sorting/StringCriterion.java
View File

@ -71,8 +71,8 @@ public class StringCriterion extends Criterion {
return new KeyMaker() {
@Override
protected Object makeKey(Object value) {
return (ExpressionUtils.isNonBlankData(value) && !(value instanceof String)) ?
collator.getCollationKey(value.toString()) : value;
return collator.getCollationKey((ExpressionUtils.isNonBlankData(value)
&& !(value instanceof String)) ? value.toString() : (String) value);
}
@Override

10
main/src/com/google/refine/templating/Parser.java
View File

@ -48,12 +48,18 @@ public class Parser {
int start = 0, current = 0;
while (current < s.length() - 1) {
char c = s.charAt(current);
char c2 = s.charAt(current + 1);
if (c == '\\') {
current += 2;
if (c2 == '\\' || c2 == '{' || c2 == '$') {
fragments.add(new StaticFragment(s.substring(start, current).concat(Character.toString(c2))));
start = current += 2;
} else {
// Invalid escape - just leave it in the template
current += 1;
}
continue;
}
char c2 = s.charAt(current + 1);
if (c == '$' && c2 == '{') {
int closeBrace = s.indexOf('}', current + 2);
if (closeBrace > current + 1) {

BIN
main/webapp/WEB-INF/lib/commons-codec-1.5.jar
View File

Binary file not shown.

BIN
main/webapp/WEB-INF/lib/commons-codec-1.6.jar Normal file
View File

Binary file not shown.

BIN
main/webapp/WEB-INF/lib/commons-logging-1.1.1.jar Normal file
View File

Binary file not shown.

BIN
main/webapp/WEB-INF/lib/fluent-hc-4.2.5.jar Normal file
View File

Binary file not shown.

BIN
main/webapp/WEB-INF/lib/httpclient-4.1.2.jar
View File

Binary file not shown.

BIN
main/webapp/WEB-INF/lib/httpclient-4.2.5.jar Normal file
View File

Binary file not shown.

BIN
main/webapp/WEB-INF/lib/httpcore-4.1.3.jar
View File

Binary file not shown.

BIN
main/webapp/WEB-INF/lib/httpcore-4.2.4.jar Normal file
View File

Binary file not shown.

BIN
main/webapp/WEB-INF/lib/httpmime-4.2.5.jar Normal file
View File

Binary file not shown.

2
main/webapp/modules/core/index.vt
View File

@ -58,7 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<div id="openrefine-version"></div>
</div>
<ul>
<li><a href="http://code.google.com/p/google-refine/wiki/DocumentationForUsers" id="or-index-help"></a></li>
<li><a href="http://github.com/OpenRefine/OpenRefine/wiki/DocumentationForUsers" id="or-index-help"></a></li>
<li><a href="about.html" id="or-index-about"></a></li>
</ul>
</div>

2
main/webapp/modules/core/project.vt
View File

@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<div id="project-controls">
<a href="./" class="button" target="_blank"><span id="or-proj-open"></span></a>
<a class="button" bind="exportButton" id="export-button" href="#export"><span class="button-menu" id="or-proj-export"></span></a>
<a href="http://code.google.com/p/google-refine/wiki/DocumentationForUsers" target="_blank" class="button"><span id="or-proj-help"></span></a>
<a href="http://github.com/OpenRefine/OpenRefine/wiki/DocumentationForUsers" target="_blank" class="button"><span id="or-proj-help"></span></a>
</div>
</div>

2
main/webapp/modules/core/scripts/project/browsing-engine.js
View File

@ -98,7 +98,7 @@ BrowsingEngine.prototype._initializeUI = function() {
'<div class="browsing-panel-help" bind="help">' +
'<h1>'+$.i18n._('core-project')["use-facets"]+'</h1>' +
'<p>'+$.i18n._('core-project')["use-to-select"]+'</p>' +
'<p>'+$.i18n._('core-project')["not-sure"]+'<br /><a href="http://code.google.com/p/google-refine/wiki/Screencasts" target="_blank"><b>'+$.i18n._('core-project')["watch-cast"]+'</b></a></p>' +
'<p>'+$.i18n._('core-project')["not-sure"]+'<br /><a href="http://github.com/OpenRefine/OpenRefine/wiki/Screencasts" target="_blank"><b>'+$.i18n._('core-project')["watch-cast"]+'</b></a></p>' +
'</div>' +
'<div class="browsing-panel-header" bind="header">' +
'<div class="browsing-panel-indicator" bind="indicator">' +

2
main/webapp/modules/core/scripts/project/history-panel.html
View File

@ -1,7 +1,7 @@
<div class="history-panel-help" bind="helpDiv">
<h1 bind="or_proj_undo"></h1>
<p bind="or_proj_mistakes"></p>
<p><a href="http://code.google.com/p/google-refine/wiki/History" target="_blank"><b><span bind="or_proj_learnMore"></span></b></a></p>
<p><a href="http://github.com/OpenRefine/OpenRefine/wiki/History" target="_blank"><b><span bind="or_proj_learnMore"></span></b></a></p>
</div>
<div class="history-panel-controls" bind="controlsDiv">
<a class="button button-pill-left" href="javascript:{}" bind="extractLink"></a><a class="button button-pill-right" href="javascript:{}" bind="applyLink"></a>

39
main/webapp/modules/core/scripts/views/data-table/menu-edit-column.js
View File

@ -78,15 +78,6 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}
);
});
var o = DataTableView.sampleVisibleRows(column);
var previewWidget = new ExpressionPreviewDialog.Widget(
elmts,
column.cellIndex,
o.rowIndices,
o.values,
null
);
};
var doAddColumnByFetchingURLs = function() {
@ -133,15 +124,6 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
);
dismiss();
});
var o = DataTableView.sampleVisibleRows(column);
var previewWidget = new ExpressionPreviewDialog.Widget(
elmts,
column.cellIndex,
o.rowIndices,
o.values,
null
);
};
var doRemoveColumn = function() {
@ -183,15 +165,18 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
};
var doMoveColumnBy = function(change) {
Refine.postCoreProcess(
"move-column",
{
columnName: column.name,
index: Refine.columnNameToColumnIndex(column.name) + change
},
null,
{ modelsChanged: true }
);
var newidx = Refine.columnNameToColumnIndex(column.name) + change;
if (newidx > 0 && newidx < Refine.columnNameToColumnIndex(column.name)) {
Refine.postCoreProcess(
"move-column",
{
columnName: column.name,
index: newidx
},
null,
{ modelsChanged: true }
);
}
};
var doSplitColumn = function() {