Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hdfview/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<dependency>
<groupId>org.eclipse.nebula.widgets.nattable</groupId>
<artifactId>org.eclipse.nebula.widgets.nattable.core</artifactId>
<version>2.5.0</version>
<version>2.6.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1140,6 +1140,28 @@ protected void loadData(DataFormat theDataObject) throws Exception
if (theDataObject.getRank() > 2)
theDataObject.getSelectedDims()[theDataObject.getSelectedIndex()[2]] = 1;

// NatTable uses 32-bit int for row/column indices
long displayRows = theDataObject.getHeight();
long displayCols = theDataObject.getWidth();
if (displayRows > Integer.MAX_VALUE) {
throw new Exception("Too many rows to display (" + displayRows + ", limit is " +
Integer.MAX_VALUE + "). Please select a smaller subset.");
}
if (displayCols > Integer.MAX_VALUE) {
throw new Exception("Too many columns to display (" + displayCols + ", limit is " +
Integer.MAX_VALUE + "). Please select a smaller subset.");
}
if (displayRows > Integer.MAX_VALUE / 20) {
log.warn("loadData(): row count {} approaches NatTable 32-bit limit; "
+ "display may not render correctly. Consider selecting a smaller subset.",
displayRows);
}
if (displayCols > Integer.MAX_VALUE / 80) {
log.warn("loadData(): column count {} approaches NatTable 32-bit limit; "
+ "display may not render correctly. Consider selecting a smaller subset.",
displayCols);
}

dataValue = null;
try {
log.trace("loadData(): call getData()");
Expand Down
2 changes: 1 addition & 1 deletion object/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.3</version>
<version>3.3.1</version>
<configuration>
<!-- specify UTF-8, ISO-8859-1 or any other file encoding -->
<encoding>UTF-8</encoding>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
<!-- Instructing the resources plugin to filter certain directories -->
<resources>
<resource>
<directory>.</directory>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
Expand Down
Binary file not shown.
17 changes: 1 addition & 16 deletions repository/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -111,22 +111,7 @@
<generatePom>true</generatePom>
</configuration>
</execution>
<execution>
<id>eclipse-nebula-widgets-nattable-core</id>
<phase>verify</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<groupId>org.eclipse.local</groupId>
<artifactId>org.eclipse.nebula.widgets.nattable.core</artifactId>
<version>2.4.0</version>
<packaging>jar</packaging>
<file>
${basedir}/lib/org.eclipse.nebula.widgets.nattable.core.jar</file>
<generatePom>true</generatePom>
</configuration>
</execution>

<execution>
<id>eclipse-swtbot</id>
<phase>verify</phase>
Expand Down