Skip to content
Merged
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ esri-geometry-api.jar
description.jardesc
*.bak
*.properties
*.zip

# Intellij project files
*.iml
Expand Down
12 changes: 8 additions & 4 deletions src/main/java/com/esri/core/geometry/AttributeStreamOfDbl.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 1995-2015 Esri
Copyright 1995-2017 Esri

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -31,14 +31,14 @@

final class AttributeStreamOfDbl extends AttributeStreamBase {

double[] m_buffer = null;
int m_size;
private double[] m_buffer = null;
private int m_size;

public int size() {
return m_size;
}

public void reserve(int reserve)// only in Java
public void reserve(int reserve)
{
if (reserve <= 0)
return;
Expand All @@ -54,6 +54,10 @@ public void reserve(int reserve)// only in Java

}

public int capacity() {
return m_buffer != null ? m_buffer.length : 0;
}

public AttributeStreamOfDbl(int size) {
int sz = size;
if (sz < 2)
Expand Down
12 changes: 8 additions & 4 deletions src/main/java/com/esri/core/geometry/AttributeStreamOfFloat.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 1995-2015 Esri
Copyright 1995-2017 Esri

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -30,8 +30,8 @@

final class AttributeStreamOfFloat extends AttributeStreamBase {

float[] m_buffer = null;
int m_size;
private float[] m_buffer = null;
private int m_size;

public int size() {
return m_size;
Expand All @@ -53,6 +53,10 @@ public void reserve(int reserve)// only in Java

}

public int capacity() {
return m_buffer != null ? m_buffer.length : 0;
}

public AttributeStreamOfFloat(int size) {
int sz = size;
if (sz < 2)
Expand Down Expand Up @@ -314,7 +318,7 @@ public void addRange(AttributeStreamBase src, int start, int count,
resize(newSize);

if (bForward) {
System.arraycopy(((AttributeStreamOfDbl) src).m_buffer, start,
System.arraycopy(((AttributeStreamOfFloat) src).m_buffer, start,
m_buffer, oldSize, count);
} else {
int n = count;
Expand Down
12 changes: 8 additions & 4 deletions src/main/java/com/esri/core/geometry/AttributeStreamOfInt16.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 1995-2015 Esri
Copyright 1995-2017 Esri

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -30,8 +30,8 @@

final class AttributeStreamOfInt16 extends AttributeStreamBase {

short[] m_buffer = null;
int m_size;
private short[] m_buffer = null;
private int m_size;

public int size() {
return m_size;
Expand All @@ -53,6 +53,10 @@ public void reserve(int reserve)// only in Java

}

public int capacity() {
return m_buffer != null ? m_buffer.length : 0;
}

public AttributeStreamOfInt16(int size) {
int sz = size;
if (sz < 2)
Expand Down Expand Up @@ -299,7 +303,7 @@ public void addRange(AttributeStreamBase src, int start, int count,
resize(newSize);

if (bForward) {
System.arraycopy(((AttributeStreamOfDbl) src).m_buffer, start,
System.arraycopy(((AttributeStreamOfInt16) src).m_buffer, start,
m_buffer, oldSize, count);
} else {
int n = count;
Expand Down
14 changes: 9 additions & 5 deletions src/main/java/com/esri/core/geometry/AttributeStreamOfInt32.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 1995-2015 Esri
Copyright 1995-2017 Esri

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -31,10 +31,10 @@

final class AttributeStreamOfInt32 extends AttributeStreamBase {

int[] m_buffer = null;
int m_size;
private int[] m_buffer = null;
private int m_size;

public void reserve(int reserve)// only in Java
public void reserve(int reserve)
{
if (reserve <= 0)
return;
Expand All @@ -54,6 +54,10 @@ public int size() {
return m_size;
}

public int capacity() {
return m_buffer != null ? m_buffer.length : 0;
}

public AttributeStreamOfInt32(int size) {
int sz = size;
if (sz < 2)
Expand Down Expand Up @@ -352,7 +356,7 @@ public void addRange(AttributeStreamBase src, int start, int count,
resize(newSize);

if (bForward) {
System.arraycopy(((AttributeStreamOfDbl) src).m_buffer, start,
System.arraycopy(((AttributeStreamOfInt32) src).m_buffer, start,
m_buffer, oldSize, count);
} else {
int n = count;
Expand Down
12 changes: 8 additions & 4 deletions src/main/java/com/esri/core/geometry/AttributeStreamOfInt64.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 1995-2015 Esri
Copyright 1995-2017 Esri

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -30,8 +30,8 @@

final class AttributeStreamOfInt64 extends AttributeStreamBase {

long[] m_buffer = null;
int m_size;
private long[] m_buffer = null;
private int m_size;

public int size() {
return m_size;
Expand All @@ -53,6 +53,10 @@ public void reserve(int reserve)// only in Java

}

public int capacity() {
return m_buffer != null ? m_buffer.length : 0;
}

public AttributeStreamOfInt64(int size) {
int sz = size;
if (sz < 2)
Expand Down Expand Up @@ -299,7 +303,7 @@ public void addRange(AttributeStreamBase src, int start, int count,
resize(newSize);

if (bForward) {
System.arraycopy(((AttributeStreamOfDbl) src).m_buffer, start,
System.arraycopy(((AttributeStreamOfInt64) src).m_buffer, start,
m_buffer, oldSize, count);
} else {
int n = count;
Expand Down
12 changes: 8 additions & 4 deletions src/main/java/com/esri/core/geometry/AttributeStreamOfInt8.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 1995-2015 Esri
Copyright 1995-2017 Esri

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -30,8 +30,8 @@

final class AttributeStreamOfInt8 extends AttributeStreamBase {

byte[] m_buffer = null;
int m_size;
private byte[] m_buffer = null;
private int m_size;

public int size() {
return m_size;
Expand All @@ -53,6 +53,10 @@ public void reserve(int reserve)// only in Java

}

public int capacity() {
return m_buffer != null ? m_buffer.length : 0;
}

public AttributeStreamOfInt8(int size) {
int sz = size;
if (sz < 2)
Expand Down Expand Up @@ -350,7 +354,7 @@ public void addRange(AttributeStreamBase src, int start, int count,
resize(newSize);

if (bForward) {
System.arraycopy(((AttributeStreamOfDbl) src).m_buffer, start,
System.arraycopy(((AttributeStreamOfInt8) src).m_buffer, start,
m_buffer, oldSize, count);
} else {
int n = count;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
/*
Copyright 1995-2017 Esri

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

For additional information, contact:
Environmental Systems Research Institute, Inc.
Attn: Contracts Dept
380 New York Street
Redlands, California, USA 92373

email: contracts@esri.com
*/

package com.esri.core.geometry.ogc;

import com.esri.core.geometry.Envelope;
Expand Down
24 changes: 24 additions & 0 deletions src/main/java/com/esri/core/geometry/ogc/OGCCurve.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
/*
Copyright 1995-2017 Esri

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

For additional information, contact:
Environmental Systems Research Institute, Inc.
Attn: Contracts Dept
380 New York Street
Redlands, California, USA 92373

email: contracts@esri.com
*/

package com.esri.core.geometry.ogc;

import com.esri.core.geometry.MultiPoint;
Expand Down
24 changes: 24 additions & 0 deletions src/main/java/com/esri/core/geometry/ogc/OGCGeometry.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
/*
Copyright 1995-2017 Esri

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

For additional information, contact:
Environmental Systems Research Institute, Inc.
Attn: Contracts Dept
380 New York Street
Redlands, California, USA 92373

email: contracts@esri.com
*/

package com.esri.core.geometry.ogc;

import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
/*
Copyright 1995-2017 Esri

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

For additional information, contact:
Environmental Systems Research Institute, Inc.
Attn: Contracts Dept
380 New York Street
Redlands, California, USA 92373

email: contracts@esri.com
*/

package com.esri.core.geometry.ogc;

public abstract class OGCGeometryCollection extends OGCGeometry {
Expand Down
24 changes: 24 additions & 0 deletions src/main/java/com/esri/core/geometry/ogc/OGCLineString.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
/*
Copyright 1995-2017 Esri

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

For additional information, contact:
Environmental Systems Research Institute, Inc.
Attn: Contracts Dept
380 New York Street
Redlands, California, USA 92373

email: contracts@esri.com
*/

package com.esri.core.geometry.ogc;

import com.esri.core.geometry.Geometry;
Expand Down
Loading