ZSS-294: cannot create a named range

zkoss · Apr 7, 2014 · 91e5b4c · 91e5b4c
1 parent f907ced
commit 91e5b4c
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 2 deletions.
diff --git a/zss/src/org/zkoss/zss/api/Range.java b/zss/src/org/zkoss/zss/api/Range.java
@@ -789,4 +789,11 @@ public Font findFont(Boldweight boldweight, Color color,
 	 * @since 3.5.0
 	 */
 	public SRange getInternalRange();
+
+	/**
+	 * Create a {@link Name} that refer to this range.
+	 * @param nameName name of the {@link Name} that you can refer in formulas.
+	 * @since 3.5.0
+	 */
+	public void createName(String nameName);
 }
diff --git a/zss/src/org/zkoss/zss/api/impl/RangeImpl.java b/zss/src/org/zkoss/zss/api/impl/RangeImpl.java
@@ -685,6 +685,8 @@ public String asString() {
 	public SRange getInternalRange() {
 		return _range;
 	}
-
-
+	@Override
+	public void createName(String nameName) {
+		_range.createName(nameName);
+	}
 }
diff --git a/zssmodel/src/org/zkoss/zss/range/SRange.java b/zssmodel/src/org/zkoss/zss/range/SRange.java
@@ -715,4 +715,9 @@ public void sort(SRange key1, boolean descending1, SortDataOption dataOption1, S
 	 */
 	public void clearAll();
 
+	/**
+	 * Create a {@link SName} that refer to this range.
+	 * @param nameName name of the {@link SName} that you can refer in formulas.
+	 */
+	public void createName(String nameName);
 }
diff --git a/zssmodel/src/org/zkoss/zss/range/impl/RangeImpl.java b/zssmodel/src/org/zkoss/zss/range/impl/RangeImpl.java
@@ -51,11 +51,14 @@
 import org.zkoss.zss.model.SSheet;
 import org.zkoss.zss.model.SSheetViewInfo;
 import org.zkoss.zss.model.SheetRegion;
+import org.zkoss.zss.model.SName;
 import org.zkoss.zss.model.ViewAnchor;
 import org.zkoss.zss.model.impl.AbstractBookSeriesAdv;
 import org.zkoss.zss.model.impl.AbstractSheetAdv;
+import org.zkoss.zss.model.impl.AbstractNameAdv;
 import org.zkoss.zss.model.impl.FormulaCacheCleaner;
 import org.zkoss.zss.model.impl.RefImpl;
+import org.zkoss.zss.model.impl.NameRefImpl;
 import org.zkoss.zss.model.sys.EngineFactory;
 import org.zkoss.zss.model.sys.dependency.DependencyTable;
 import org.zkoss.zss.model.sys.dependency.DependencyTable.RefFilter;
@@ -1674,6 +1677,38 @@ protected Object doInvoke() {
 			protected void doBeforeNotify() {}
 		}.doInWriteLock(getLock());			
 	}
+
+	@Override
+	public void createName(final String nameName) {
+		new ReadWriteTask() {
+			@Override
+			public Object invoke() {
+				createNameInLock(nameName);
+				return null;
+			}
+		}.doInWriteLock(getLock());
+	}
+
+	private void createNameInLock(String nameName) {
+		final SSheet sht = getSheet();
+		final String sn = sht.getSheetName();
+		final org.zkoss.poi.ss.util.AreaReference af = new org.zkoss.poi.ss.util.AreaReference(
+				new org.zkoss.poi.ss.util.CellReference(sn,getRow(),getColumn(),true,true), 
+				new org.zkoss.poi.ss.util.CellReference(sn,getLastRow(),getLastColumn(),true,true));
+		final String refers = af.formatAsString();
+		final SName name = getBook().createName(nameName);
+		name.setRefersToFormula(refers);
+
+		// Some formula might have referred to the {@link Name} by the specified nameName already; 
+		// have to notify those cells.
+		final AbstractBookSeriesAdv series = (AbstractBookSeriesAdv) getBookSeries();
+		final DependencyTable table = series.getDependencyTable();
+		handleRefNotifyContentChange(series, table.getEvaluatedDependents(new NameRefImpl((AbstractNameAdv)name)));
+
+		// Notify change of the associated range of this name
+		// TODO: createName does not change contents of the associated range, do I have to notifyChange? 
+		SRanges.rangeByName(sht, nameName).notifyChange();
+	}
 
 	private static final SRange EMPTY_RANGE = new EmptyNRange();
 }