[Git][java-team/openrefine][upstream] New upstream version 3.7.6

Markus Koschany (@apo) gitlab at salsa.debian.org
Tue Oct 17 21:38:41 BST 2023



Markus Koschany pushed to branch upstream at Debian Java Maintainers / openrefine


Commits:
737927ff by Markus Koschany at 2023-10-17T22:33:27+02:00
New upstream version 3.7.6
- - - - -


22 changed files:

- benchmark/pom.xml
- extensions/database/pom.xml
- extensions/gdata/pom.xml
- extensions/jython/pom.xml
- extensions/pc-axis/pom.xml
- extensions/phonetic/pom.xml
- extensions/pom.xml
- extensions/wikibase/module/scripts/dialogs/statement-configuration-dialog.js
- extensions/wikibase/module/scripts/schema-alignment-tab.html
- extensions/wikibase/module/scripts/schema-alignment.js
- extensions/wikibase/module/styles/schema-alignment.less
- extensions/wikibase/pom.xml
- extensions/wikibase/src/org/openrefine/wikibase/schema/strategies/QualifiersStatementMerger.java
- extensions/wikibase/tests/src/org/openrefine/wikibase/schema/strategies/QualifiersStatementMergerTests.java
- main/pom.xml
- main/src/com/google/refine/RefineServlet.java
- main/webapp/modules/core/scripts/facets/list-facet.js
- main/webapp/modules/core/scripts/project.js
- packaging/pom.xml
- pom.xml
- server/pom.xml
- server/src/com/google/refine/Refine.java


Changes:

=====================================
benchmark/pom.xml
=====================================
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>openrefine</artifactId>
     <groupId>org.openrefine</groupId>
-    <version>3.7.5</version>
+    <version>3.7.6</version>
   </parent>
 
   <artifactId>benchmark</artifactId>


=====================================
extensions/database/pom.xml
=====================================
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.openrefine</groupId>
     <artifactId>extensions</artifactId>
-    <version>3.7.5</version>
+    <version>3.7.6</version>
   </parent>
 
   <build>


=====================================
extensions/gdata/pom.xml
=====================================
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.openrefine</groupId>
     <artifactId>extensions</artifactId>
-    <version>3.7.5</version>
+    <version>3.7.6</version>
   </parent>
 
   <properties>


=====================================
extensions/jython/pom.xml
=====================================
@@ -5,7 +5,7 @@
   <groupId>org.openrefine</groupId>
   <artifactId>jython</artifactId>
   <packaging>jar</packaging>
-  <version>3.7.5</version>
+  <version>3.7.6</version>
 
   <name>OpenRefine - Jython extension</name>
   <description>OpenRefine integration of Python as an expression language</description>
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.openrefine</groupId>
     <artifactId>extensions</artifactId>
-    <version>3.7.5</version>
+    <version>3.7.6</version>
   </parent>
 
   <build>


=====================================
extensions/pc-axis/pom.xml
=====================================
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.openrefine</groupId>
     <artifactId>extensions</artifactId>
-    <version>3.7.5</version>
+    <version>3.7.6</version>
   </parent>
 
   <build>


=====================================
extensions/phonetic/pom.xml
=====================================
@@ -5,7 +5,7 @@
   <groupId>org.openrefine</groupId>
   <artifactId>phonetic</artifactId>
   <packaging>jar</packaging>
-  <version>3.7.5</version>
+  <version>3.7.6</version>
 
   <name>OpenRefine - Phonetic clustering extension</name>
   <description>Adds a few advanced phonetic clustering methods</description>
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.openrefine</groupId>
     <artifactId>extensions</artifactId>
-    <version>3.7.5</version>
+    <version>3.7.6</version>
   </parent>
 
   <build>


=====================================
extensions/pom.xml
=====================================
@@ -5,7 +5,7 @@
   <groupId>org.openrefine</groupId>
   <artifactId>extensions</artifactId>
   <packaging>pom</packaging>
-  <version>3.7.5</version>
+  <version>3.7.6</version>
 
   <name>OpenRefine - extensions</name>
   <description>Extensions add importers, exporters and other sorts of features to OpenRefine</description>
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.openrefine</groupId>
     <artifactId>openrefine</artifactId>
-    <version>3.7.5</version>
+    <version>3.7.6</version>
   </parent>
 
   <modules>


=====================================
extensions/wikibase/module/scripts/dialogs/statement-configuration-dialog.js
=====================================
@@ -18,7 +18,7 @@ class PropertyStrategy {
 
 class SnakStrategy {
   id() {
-    return 'property';
+    return 'snak';
   }
 
   initialState() {


=====================================
extensions/wikibase/module/scripts/schema-alignment-tab.html
=====================================
@@ -1,5 +1,5 @@
 <div id="schema-alignment-tab">
-    <div bind="schemaHeader">
+    <div bind="schemaHeader" class="schema-alignment-header">
         <div class="schema-alignment-save"><button class="button button-primary" bind="saveButton"></button><br /><button class="button button-primary" bind="discardButton"></button></div>
         <p class="panel-explanation"><label bind="targetWikibaseLabel" for="wikibase-instance-selector"></label> <select bind="wikibaseSelect" name="wikibase-instance-selector" id="wikibase-instance-selector"></select></p>
         <p class="panel-explanation" bind="dialogExplanation"></p>


=====================================
extensions/wikibase/module/scripts/schema-alignment.js
=====================================
@@ -315,18 +315,6 @@ SchemaAlignment.switchTab = function(targetTab) {
   }
 };
 
-SchemaAlignment.resize = function() {
-  if (this._viewPanel) {
-    var panelHeight = this._viewPanel.height();
-    this._schemaPanel.height(panelHeight);
-    this._issuesPanel.height(panelHeight);
-    this._previewPanel.height(panelHeight);
-    // Resize the inside of the schema panel
-    var headerHeight = this._schemaElmts.schemaHeader.outerHeight();
-    this._schemaElmts.canvas.height(panelHeight - headerHeight - 10);
-  }
-};
-
 SchemaAlignment.isSetUp = function() {
   return SchemaAlignment._isSetUp;
 };


=====================================
extensions/wikibase/module/styles/schema-alignment.less
=====================================
@@ -19,10 +19,6 @@
   height: 100%;
 }
 
-#schema-alignment-tab {
-  overflow: hidden;
-}
-
 .main-view-panel-tab-header {
   margin-top: 9px;
   margin-left: 7px;
@@ -46,8 +42,8 @@
 }
 
 .schema-alignment-dialog-canvas {
-  background: white;
   overflow-y: auto;
+  margin-bottom: 3em;
 }
 
 .schema-alignment-dialog-entity-edits-area {
@@ -60,6 +56,18 @@
   overflow-y: auto;
 }
 
+.schema-alignment-header {
+  position: sticky;
+  top: 0;
+  padding-top: 1em;
+  background-color: var(--background-primary);
+  z-index: 1;
+}
+
+.schema-alignment-header .panel-explanation:first-child {
+  margin-top: 0;
+}
+
 .panel-explanation {
   margin: 1em;
 }


=====================================
extensions/wikibase/pom.xml
=====================================
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.openrefine</groupId>
     <artifactId>extensions</artifactId>
-    <version>3.7.5</version>
+    <version>3.7.6</version>
   </parent>
 
   <properties>


=====================================
extensions/wikibase/src/org/openrefine/wikibase/schema/strategies/QualifiersStatementMerger.java
=====================================
@@ -49,11 +49,14 @@ public class QualifiersStatementMerger implements StatementMerger {
 
     @Override
     public boolean match(Statement existing, Statement added) {
+        Snak existingSnak = existing.getMainSnak();
+        Snak addedSnak = added.getMainSnak();
+
         // Select the discriminating SnakGroups
         List<SnakGroup> existingDiscriminatingSnaks = discriminatingSnaks(existing.getQualifiers());
         List<SnakGroup> addedDiscriminatingSnaks = discriminatingSnaks(added.getQualifiers());
 
-        return snakGroupsEqual(existingDiscriminatingSnaks, addedDiscriminatingSnaks);
+        return snakEquality(existingSnak, addedSnak) && snakGroupsEqual(existingDiscriminatingSnaks, addedDiscriminatingSnaks);
     }
 
     @Override


=====================================
extensions/wikibase/tests/src/org/openrefine/wikibase/schema/strategies/QualifiersStatementMergerTests.java
=====================================
@@ -33,6 +33,7 @@ public class QualifiersStatementMergerTests {
     PropertyIdValue otherPid = Datamodel.makeWikidataPropertyIdValue("P898");
     PropertyIdValue otherPid2 = Datamodel.makeWikidataPropertyIdValue("P33333");
     Snak mainSnak = Datamodel.makeValueSnak(otherPid, qidA);
+    Snak otherMainSnak = Datamodel.makeValueSnak(otherPid, qidB);
     SnakGroup discriminatingQualifier1 = Datamodel.makeSnakGroup(
             Collections.singletonList(Datamodel.makeValueSnak(discrimatingQualifierPid, qidA)));
     SnakGroup discriminatingQualifier2 = Datamodel.makeSnakGroup(
@@ -53,6 +54,7 @@ public class QualifiersStatementMergerTests {
     Statement statementD = statement(Datamodel.makeClaim(qidA, mainSnak, Arrays.asList(
             nonDiscriminatingQualifier2, discriminatingQualifier1, nonDiscriminatingQualifier3)));
     Statement statementE = statement(Datamodel.makeClaim(qidA, mainSnak, Collections.emptyList()));
+    Statement statementF = statement(Datamodel.makeClaim(qidA, otherMainSnak, Collections.singletonList(discriminatingQualifier1)));
 
     @Test
     public void testMatchNoPids() {
@@ -74,6 +76,7 @@ public class QualifiersStatementMergerTests {
         assertTrue(SUTwithPids.match(statementA, statementD));
         assertFalse(SUTwithPids.match(statementA, statementE));
         assertTrue(SUTwithPids.match(statementC, statementD));
+        assertFalse(SUTwithPids.match(statementA, statementF));
     }
 
     @Test


=====================================
main/pom.xml
=====================================
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.openrefine</groupId>
     <artifactId>openrefine</artifactId>
-    <version>3.7.5</version>
+    <version>3.7.6</version>
   </parent>
 
   <properties>


=====================================
main/src/com/google/refine/RefineServlet.java
=====================================
@@ -65,7 +65,7 @@ import edu.mit.simile.butterfly.ButterflyModule;
 
 public class RefineServlet extends Butterfly {
 
-    static private String ASSIGNED_VERSION = "3.7.5";
+    static private String ASSIGNED_VERSION = "3.7.6";
 
     static public String VERSION = "";
     static public String REVISION = "";


=====================================
main/webapp/modules/core/scripts/facets/list-facet.js
=====================================
@@ -160,7 +160,7 @@ class ListFacet extends Facet {
       '<div class="facet-controls" bind="controlsDiv" style="display:none;">' +
         '<a bind="choiceCountContainer" class="action" href="javascript:{}"></a> ' +
         '<span class="facet-controls-sortControls" bind="sortGroup">'+$.i18n('core-facets/sort-by')+': ' +
-          '<a href="javascript:{}" bind="sortByNameLink">'+$.i18n('core-facets/name')+'</a>' +
+          '<a href="javascript:{}" bind="sortByNameLink">'+$.i18n('core-facets/name')+'</a> ' +
           '<a href="javascript:{}" bind="sortByCountLink">'+$.i18n('core-facets/count')+'</a>' +
         '</span>' +
         '<button bind="clusterLink" class="facet-controls-button button">'+$.i18n('core-facets/cluster')+'</button>' +


=====================================
main/webapp/modules/core/scripts/project.js
=====================================
@@ -105,9 +105,6 @@ function resizeAll() {
   ui.processPanel.resize();
   ui.historyPanel.resize();
   ui.dataTableView.resize();
-  if (SchemaAlignment) {
-    SchemaAlignment.resize();
-  }
 }
 
 function initializeUI(uiState) {


=====================================
packaging/pom.xml
=====================================
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.openrefine</groupId>
     <artifactId>openrefine</artifactId>
-    <version>3.7.5</version>
+    <version>3.7.6</version>
   </parent>
   <properties>
     <rootdir>${basedir}/..</rootdir>


=====================================
pom.xml
=====================================
@@ -5,7 +5,7 @@
   <groupId>org.openrefine</groupId>
   <artifactId>openrefine</artifactId>
   <packaging>pom</packaging>
-  <version>3.7.5</version>
+  <version>3.7.6</version>
 
   <name>OpenRefine</name>
   <description>OpenRefine is a free, open source power tool for working with messy data and improving it</description>


=====================================
server/pom.xml
=====================================
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.openrefine</groupId>
     <artifactId>openrefine</artifactId>
-    <version>3.7.5</version>
+    <version>3.7.6</version>
   </parent>
 
   <properties>


=====================================
server/src/com/google/refine/Refine.java
=====================================
@@ -497,7 +497,7 @@ class RefineClient extends JFrame implements ActionListener {
     }
 
     private void openBrowser() {
-        if (!Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
+        if (!Desktop.getDesktop().isSupported(Desktop.Action.BROWSE) || System.getenv("SNAP") != null) {
             try {
                 openBrowserFallback();
             } catch (IOException e) {



View it on GitLab: https://salsa.debian.org/java-team/openrefine/-/commit/737927ffb8db3da9b3b6714717e3f1e1cf98c7df

-- 
View it on GitLab: https://salsa.debian.org/java-team/openrefine/-/commit/737927ffb8db3da9b3b6714717e3f1e1cf98c7df
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20231017/32c7f06f/attachment.htm>


More information about the pkg-java-commits mailing list