Merge 1.1.0 changes back to master.

This commit is contained in:
James Muehlner
2019-08-08 22:13:05 -07:00
33 changed files with 1755 additions and 22 deletions

View File

@@ -117,6 +117,12 @@ public class Field {
*/
public static String QUERY_PARAMETER = "QUERY_PARAMETER";
/**
* A color scheme accepted by the Guacamole server terminal emulator
* and protocols which leverage it.
*/
public static String TERMINAL_COLOR_SCHEME = "TERMINAL_COLOR_SCHEME";
}
/**

View File

@@ -0,0 +1,39 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you 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.
*/
package org.apache.guacamole.form;
/**
* Represents a terminal color scheme field. The field may contain only valid
* terminal color schemes as used by the Guacamole server terminal emulator
* and protocols which leverage it (SSH, telnet, Kubernetes).
*/
public class TerminalColorSchemeField extends Field {
/**
* Creates a new TerminalColorSchemeField with the given name.
*
* @param name
* The unique name to associate with this field.
*/
public TerminalColorSchemeField(String name) {
super(name, Field.Type.TERMINAL_COLOR_SCHEME);
}
}

View File

@@ -68,7 +68,7 @@
"fields" : [
{
"name" : "color-scheme",
"type" : "TEXT",
"type" : "TERMINAL_COLOR_SCHEME",
"options" : [ "", "black-white", "gray-black", "green-black", "white-black" ]
},
{

View File

@@ -47,7 +47,7 @@
"fields" : [
{
"name" : "color-scheme",
"type" : "TEXT",
"type" : "TERMINAL_COLOR_SCHEME",
"options" : [ "", "black-white", "gray-black", "green-black", "white-black" ]
},
{

View File

@@ -51,7 +51,7 @@
"fields" : [
{
"name" : "color-scheme",
"type" : "TEXT",
"type" : "TERMINAL_COLOR_SCHEME",
"options" : [ "", "black-white", "gray-black", "green-black", "white-black" ]
},
{